update project Architecture and Makefile
update Makefile
update Makefile with
move sample2 and test to main and test folder