Rearrange directory structure to follow spec