Continue cart module refactoring