Remove unnecessary files
Cleanup structure