changed directory structure and namespaces
Changing namespaces
Changing namespaces and doing deleted files now
Changing more namespaces