new v2 released + reorganisation