Updated package name and Added a lot of comments