Initial restructure for splitting of servlets & JSPs  for Unit functionality.