controller refactoring
nested controller refactoring