Moved classes into package file
clean up
Update WebPage.java