Making things run again - fixing to reorganization