Refactoring

1) Namespaced all controllers and moved them to the src folder
2) Removed hacky aliasing
3) Removed the workbench stuff - it just adds extra overhead we don't use