Renamed the factories for creating singletons when normal association creation would result in a violation of a uniqueness constraint.  Removed the upload factory as it wasn`t being utilized