refactoring - use java 8 style and rename all dtos.