Separate Graph Model and Controller
Separate model in one class
Fix VS filters
Move Model to their own folder
Move datastore include inside