Extending, Refactoring & Testing the new structure