feat(refactor): minor modules refactor