changed makefile, reorganized dir tree