Refactoring controllers + recursive modules