Moved the SPA inside API