restructure common file cascade