Changed the Main Spec to have the proper name.
Reorganized to place the Spec in the proper folder.