security files missing from previous commit.
restructure how factories are working and collapsed some classes.
VS2013 missed some files in the previous commit.