Tidy; move files into the correct directory and delete some pointless comments