Folder structure and new makefile
Merge remote-tracking branch 'origin/master'