Changed Namespacing, started to build in angular