Finalize changes to make files generic/organization-agnostic