Fixed edit function
Flattened file structure.