moved files around and removed files