Cleanup in names and packages.
Empty reader for data input, added.