Added makefile for unit testing
Renamed directories.
Merge pull request #4 from sgregersen/master

master