Added common_system attribute.
Renamed files with otr to have core.