Remove Java6 versions as it's not used.
Use gmaven for compiling

Must rename src dirs