Directory structure clean up.