gui file structure reorganised