Updated sample app archetype, not quite there yet, classes are in wrong packages