Restructured models and collections into single files