Removed a couple of duplicate files
Merge remote-tracking branch 'origin/feature/redesign' into feature/redesign