code base restructured