Restructing Sections of Code, and adding files for parsing config file