Changed directory structure
Adjust in MakeFile
Merge branch 're-structured'