Merge pull request #11 from mdrewt/greg

controller slight change
file renaming