Rejigger
More fixes
Rename conflicting file