Moved Psi into package
Moved some model components to model package