Added cmakefile and moved to include and source directory
Reordered