Reworking the directory to make building easier.