Moved main class to different package