Refactoring Module class
removed getChoices() from Module
Done refactoring Module and ModuleSet