moved files around, removed crap