edit, and add some file structure stuff