Cleaned up OA in preparation for adding addons to more mods than just OC. Bunch of refactoring.