Adjust directory structure to closer resemble master.