Add manager, doc oc and clean source