*use refs
*relocate some files
+add model object