Rearange grunt layout