Restructure some blocks, default simulator to enabled