Refactored system ready for new+improved integration tests as well as provision of an API