Correct the namespace of the 2 classes of Model layer (crap!)