[refactor] organizing modules