Re-organize the directory structure for cleaner deployment.