Codebase layout changes