adding functionality/(re)organizing org config, specifically