Instances logic - new config logic - renaming some files.