Organize scripts and test