restructured files per Eliza