Moved configs and data into other files