File hierarchy fix