Move skeleton option into module