addded and renamed a few groovy and java files