Fixing directory structure
Cleaning up AGAIN