Start separating handler for API and for the rest
Restructure APIs