Refactored classes into packages
Fixed warning from untyped JComboBox (new in Java 7)