Move appstuff into separate package