Reorg files to mimic server setup.