Moved spec/* to spec/lib
Updated spec files to use new folder structure
Fixed router spec files so that all spec files may be run together