reorganize and gruntify