new modules structure and new util module