Still changed the structure a little more. Single config file and Database access.