Module refactor for project