Cleanup repo J - Order in rootdir and recovery