All working end to end

fix features for actual values,
move common modules