Changed folder structure and Makefile.
Resolve merge conflict.