Add Makefile and update folder structure.