Move specs to the appropriate structure