Reorganize for easier documentation
Reorganize, again!