Dev commit: Continuing work with the integration of the internal module system.