Apply code conventions to class methods
Lots of refactoring, change package name removing compile problems
also remove rectangle class - use java.awt.Rectangle instead