Split up click into a package