(refactor) compiles into one file and splits out getOrg into composable parts
(cleanup) petty amounts of cleaning