cleanup: Clean up directory structure.