Renamed to common structure.
Updated info about naming convention