Just a bit of cleaning up the api, next step is to split the modules and
finally finish the graph