Change directory structure, and add code for dev-specific patching.