Updated Extra-Source-Files accordingly with #165