Consolidated start script and re-structures