Did some serious re-organization