Reorganization complete, now just need to make it work again