Module rearrangement to make API less verbose