Added namespacing to controllers, models and structures