Moved to new folder and added Makefile