Restructure and rename scripts