Did some cleanup
Cleaned up the whole directory structure