Relatively hacky modularization