Break out containers into seperate Core and Module.