upgrade to stubbles/core 5.x
move instance management to where it belongs
shorten class names
minor adjustments