moved some files around
basic refactoring