Great library codebase restructuring