Move some files and other smaller changes