Refactoring of source module