Should probably commit the rearranged directories as well