Updated makefile and folder structure.