Move things into more appropriate directories