Rearranging and adding comments

Adding comments to files and getting rid of some non-version controlled
names.