Reworked skeletons for base app classes a bit