Clean up directory structure and files