Correct file names

Correct filenames, and consolidate forked repo and locally started (part
1)