Cleaned Imports, Cleaned namespaces

namespaces now should be in small caps