Added filepath variable. Fixed and pushed support file names, so they
should be corrected by pulling.