Cleanup directory structure