Moved main class out of the package