Features/pimped scaffolding

@noelle @manufaktor plz have a look at this