Reorganized model structure + Datamapper integration (to check)