Refactoring into correct modules