Structural reorganization

Additionally began implementation of data factories.