Correct namespace : todo package objects in separate folder