re-organize everything and merge updated jsp