Reorganize, update configs