added "Containers" namespace, and reordered some files