Re-configured imports and modified the API spec