Moved source files from default package to CMMS package