Directory structure modified to a large extent