Change structure, prepare grunt