Working on api structure. Removed unnecessary facade code.