Move feature specs to their proper folder structure