Redid structure

Moved models to their own files and added the ET namespace.