fixed validation package
fixed lauout
mv model packageunder template