Added bin/ from upstream
Added build.xml from upstream
Refactored