Reorganise grunt tasks for bower/npm packaging