Reorg with jam package in subfolder.