compleated refactoring of systemModule