Fixed Config and re-added some files removed erroneously