Started to refactor methods in classes from entity package