Corrected cleanup
Cleanup
Refactored directory structure