Further cleaning after Cardptr removal
moved model files to thier folder
merging