Refactor to com java and resources ready for 1.7.2