Refactoring entities, behaviours, actions