Further restructuring. Watch for static artifacts, and relocation for easier copying.