Initial commit
Back to java 6. Further refactoring.