moved files to better locations