Updated structure and scripts