Cleaned out closed todos
Removed setter methods
Refactoring after moving of classes
Move class to internal package
Refactoring towards using builders instead of convertors
Removed compleeted fixme comment
made the fields final
Refactoring towards the use of builders
Use the builder