Various re-org and reformatting