reorder require_all to load things correctly

Maybe