Update file structure (fixes)