renamed folders and namespaces
Seperated out namespaces as it made me feel dirty