Organize specs by class

close #71 (PR)
close #70 (Issue)