Added namespaces to controllers and models