Final code moved

all code ported to new version