Rename config file
Add Collection::setAndGet (by reference)
Clean up some code