Framework for revised project. Makefile will be added later.