moved files around
restructured tests