Refactoring and new Modules/Tests.