Revised File Structure

by CH