factory edits
syntax changed
syntax reversed
spec file structure update
organized spec requests and models folders
edited question in Factory
fixed merge conflicts w/ amy