Replaced Makefile with cmake, not tested yet
Moved to cmake