Create common module and move api calls there
Dont concat for now, also remove lint