split up some files

hopefully this will help remove some dependencies.