adjusting namespaces

removed old files