hierarchy restructuring for the sake of in-file paths