Refactoring of actions and added entrance module