Fixed setup script to be more complete and rename