beginning refactoring and re-architecture of the main components in support of the new api design goals