added Emakefile and reorganized