Directory structure clean up