Final changes to static dirs (for now).