Start major refactoring of BOCA. For now, I'm just removing
duplicated code and refactoring some to objects.