cleanup

moved files around