Organized specs properly and added rake tasks