#49 remove unused classes + start cleanup
#49 remove unused inner classes that are used as wrapper + added a toString implementation