Structure Update on Codebase