moved to flat structure