Issue #16: incorporated Streams into Files; marked various methods as deprecated