Removed todo
Implemented so the generation works for non java output as well
Fixed TODO
Cleaned out closed todos
Removed setter methods
Refactoring after moving of classes
Move class to internal package