Change config constants a la Ben,

Also moved datafiles directory into config