cleanup / moved files around