File fixing

Changes to more appropriate file names and fixes relative paths