Source Code

Removed a class
Improved Main.java (a lot!)
Fixed a bug