Reorganization to clarify dependencies

#498