Handling the folder hierarchy in controllers
Merge branch 'master' of https://github.com/daofresh/tomato