Remove redundant classes
Add placeholders for controllers
Remove redundant namespace for constants