Refactored name of main package