House-cleaning and moved configuration files.