#414298 Rearranging panels includes files for consistency with views files and needs of panels module, per IRC conversation with Earl and Michelle.