Remove Duplicate files and correct namespace