Added rspec test and separated the classes (each file for each class)