Add GEMs with new Rake structure