Modify InstantiationService to have 1 file per entry
Several SONAR fixes
Make instantiation service better scalable.