Add Makefile
Restructure files