chore(*): clean modules with improved api