File hierarchy totally re-arranged.