Major Project Refactoring (References Updated)