Oc framework cleaned up and moved out