Implemented the initial stage of the new modularization system