Restructed project, replaced makefile with cmake