edm2boy: made significant structure changes