Added FileContainer class, and renamed some other classes.