Restructured from language/structure/* to structure/language/*