code clean-up: renaming, obsolete classes removal