basedir cleamup and gitignore update