I'm going to need to duplicate and edit the top/bottom pieces in
order to create better extended pieces, so this moves them into
something explicitly-named. next commit will fix the extended pieces
Signed-off-by: Brian S. Stephan <bss@incorporeal.org>