re org directory structure