Change the folder structure

+ Add other models (not all are working).
Merge branch 'beta'