Further variable folder reorganization