Refactoring: new file organisation