refactor(core): minor modules refactor and improvements