Overhaul - new naming convention and some progress in consolidation of classes and methods