Move generic deps into generic/ folder