phoromatic: More module refactoring