Re-org and more cleanup