Fix name collision
Remove obsolete files