moved ui classes into specific packages
applied java.beautify() to the code
Merge pull request #8 from jacketattack/cleanup

Cleanup