Reorganize, cleanup and update rootdir