Fix packaging in container module + add builder class