renamed several files, repo status messed up
merged Document.java
trying to resolve some file rename issues