Restructured project and modified Makefile.