Changed filenames and fixed config