Rearrange structure, prepare for Docker proper.