Move amplifiers into detection subsheets

Reannotate