Add a Makefile for testing and mv structure to fit requirement