Fixing Directory Structure, and cleaning up