renamed classes, packages, removing TODOs