Refactored architecture, now built as a static library