Cleaned up directory structure
Cleaned up directory structure