Just a reorganization of scripts