Update to script structure
Merge branch 'test'