Reorganizing the spec folder and gems so they run properly