Added configuration file and changed some names for clarity.