Frontent moduls refactoring