Re-Organization into a Package Structure, Utils, Configurable Team IP