Restructured code, removed generated EOSes