code changes for maven eclipse project converstion and code rebase