Refactoring
Refactoring
Small bugfixes for refactoring
Install automatization with ant build.xml.
Few small changes