Bugfixes and improvements

- Source code and file cleanup
- Actions were distributed in corresponding controllers
- Optimized usage and generation of main module group