Structure improvment, most model made to be container classes. Added
dataManager.#