Fixed compile issues by setting java to 1.7.
Moved impl to RI package.