moving files around and polishing classes
updating spec_helper