Reorganized - copied over config from work git