Renamend controllers and some refactoring
Fix checkstyle
Merge pull request #35 from florisverburg/feature_dependencies

Renamed controllers and some refactoring