Move everything in a common namespace.
Merge both projects and update ant-file.
Correct test-cases.
Add "gen" target to build.xml.
Remove .gitignore to avoid blacklisting conflicts.