[CHANGE] Re arrange script