Severely reduce the number of folders
Makefile updated, soe.* named better