Adding Javadoc and deleting unnecessary classes