File cleaning

Removed some duplicate files and changed names to be correct.