Api migrations

* Moved api to better name
Various fixes

* Getting modules to work