refactoring directory names and added Makefile