re-organized client and slot/container files