re-organization and new scripts