Cleaned directory structure and added makefile