Removed old files, updated file paths to be dynamic