Change the directory structure in order to be closer to completion