Moved all EC items into the submod