Moved files around, removed files from wrong location