Base commit, few thoughts about how Structures should be grouped