Minor formatting change
Rename and move some files
Improved Makefile and reorganized tests