Restructuring directory and added makefile