Directory reorganization to add Makefile