Better manual organization; Include Liu's optical flow module