fix fs organization