Move stuff around, add read_dir, read_stat