Use cmake. Changed directory structure.
Merge remote branch 'origin'

Conflicts:
	README.md