make some more structure and killing weird .exec()-errors