some environment reorganisation
renamed setup files to be executed first