Moved Main out of package