Changed module hierarchy so that they can be both a JPanel, yet still be

observed.