reorganised files and renaming