removed old files, update NAMESPACE accordingly
merge differences