Update file structure for eventual automation