Began moving fitness over to its own class