Move specs into appropriate classes