Reorganised structure of files
Fixed Conflicts.