rm duplicate files after package structure refactoring