Cleanup
Organize classes into namespaces