Structure config file better, update sample config