Renamed main class pack for avoid confusion