Restructure to use config file