added some missing files, organized slightly