Some changes. Does not compile yet
Eclipse works now. Ant does not
Fixed ant
Fixed classpath. No more errors
Merged from structuring
Merged structuring branch