REORGANISED FILE STRUCTURE