Added separate config files... not sure if happy yet.