Separate core modules from utilities