Makefile works
*restored old source tree structure
*both cmake and make build system work