moved specs into subfolders, spec'd more, cleaned