Refactored into com java and resource ready for 1.7.2
Finalized refactor