Updated partial reference implementation to a fully modular design