New version architecture

New architecture with an object-oriented structure rather than a single library