Global cleaning - Fix 4 chelstyle errors - Refactor rename packages -
Add tests for the Main class - Line coverage 100% - Branch coverage 96%