Changed Main class for Native packaging
Defect Fixes