Minor refactoring consisting of moving files and modules around