Changed the namespaces used and improved the build process