Consolidated modules into 1 (removes cyclical dependencies)
Moved some ORM code into api, also performed some cleanup.
Adjusted init as needed and changed version to 2.0