Renamed some stuff. Add a new folder. Starting spec from scratch for round two.