restructure - remove clients and schemas