Reorganize for 2.0