Minor update
Properly split files now
Updated makefile
Fixed #7