Remove obsoleted code and move adapters to correct namespace