a bit of refactoring/file moving