In recent work, we have shown that in the adiabatic limit (large amplitude, small momentum), time-dependent Hartree-Fock theory (TDHF) yields a well-defined theory of large-amplitude collective motion which provides an essentially unique construction for a collective hamiltonian. An alternative theory, put forward by Rowe and Basserman and by Marumori is, apparently, not restricted to small momenta. We describe a general framework for the study of collective motion in the semi-classical limit without limitation on the size of coordinates or momenta, which includes all previous methods as limiting cases. We find it convenient, as in the past, to consider two general systems: first, a system with n degrees of freedom and no special permutation symmetry, and, second, a system of fermions described in TDHF. For both systems the problem can be formulated as a search for a hamiltonian flow confined to a finite-dimensional hypersurface in a phase space, which itself may be finite- or infinite-dimensional. Though, in general, there are no exact solutions to this problem, we can formulate consistent approximation schemes corresponding to both the adiabatic and Rowe-Basserman, and Marumori limits. We also show how to extend the momentum expansion, which underlies the adiabatic approximation, to higher orders in the momentum. We thereby confirm the structure of the theory found in our previous work.