Changed way multiple factsets are loaded so it doesn't affect scoobis graph. Renamed storage classes for better versioning