once again... a lot of things, but also removed controllers and let only the API