Clean up directory structure