Re-org of a few files