Move source files into src/ subdirectory
Use cmake to generate Makefile
Merge remote-tracking branch 'origin/master'