cleanup
namespace controllers
api controllers + tests