Started script reorganization