Recoding algorithms and imports because of the change of architecture