Refactored a few packages to keep files organized. Fixed minior issues
in a few HTML files where the paths were not updated to link to correct
HTML/Servlets necessary for correct functionality.