Moving classes around and writing Javadoc