Made changes to the structure, to improve usage of OPS. More changes!