Put Models in their own namespace
Fix some asset issues