More structure and a config file prototype