Consolidated organization of the code base