Removed framework classes (only archetypes left here) and small changes in folders structure