Refactored models, load all in folder, cleanup of index