Finished moving to new directory structure