Add source files to Makefile
Progress in structure