Code more modular.
Swing modules added.