Updates to Org setup for refiling entries