Major restructue of configuration files and duplicate code, see wiki for configuration details