Reorder package/file/service to better represent the model, and make sure ordering is correct.