rename var again
fix dist build, some reorganasation
ignore dist for now