Folder structure creation and feature roll back

Hi,  Need help !!  1.We recently moved to agile model. we are 2 teams running parallel - Prod support & Feature development/Bug fixes.  Earlier team created a copy of project in svn. Now new folder is created for every sprint to move changes and PS team need to add code in both main folder and the current sprint folder which is rework.  Is there any option so that the folder structure is in such a way that it can be used for both production support and feature development without any rework.  2. Feature roll back - if we develop 4 features and client wants only 2 in deployment then it is again rework to team to remove/shelve code and check in.  Pls provide best option