file organisation refactoring