Convention and naming improvements

[augustjune]

This PR improves code quality by making the code base more consistent with:

• improved namings
• separating classes from case classes
• convenient location of type definitions