Minor changes and re-org