Reorganization to clarify dependencies