Feature/stze/presentation controller

this branch contains all chages of feature/STZE/cleanup, so merge other first, than this here.