Move collections and models to a single files
Add templates