Clean up folders controller
Nested folders and fixed forms/controller actions to work with nested resources