Remove packages inside api. Everything lives inside api package now.
Fix broken test.
Change 'Controller' response structure.