changed project structure (added new package)
added JavaDoc
updated toString
updated toString
removed redundant method
added TODO and removed redundant method