Refactoring : continued

Back in business : for the time being, core functionality is working;
however, Tests will have to be refactored to reflected architectural
changes...