rename models folder
simplify naming