restructure mochas