re-organized configuration files