Restructured the project, new Makefile for tests