Extract classes to own files, update gemspec