Moved EOD to new package