Cleaned up web java source package to follow page structure of jsp views