Organize scripts and add more commenting