Moved class files to separate projects and separated out namespaces