replaced Exceptions to dir with name Exception without s on the end
reduced complexity Stream class