boyscout: cleaned up usings. Moved clients into new namespace