move api structure to allow easier integration with other projects