Renaming of source files according to new convention. Made install script more readable.

The fork and merge functions remains largely untested.