Module Refactoring
Update Main for new Handler Notation