Added new javadocs and refactored some objects name