Move bin specs into features, add restore spec