Upgrading to CR3
Refactoring and Reorganizing