move files and fix a few things