add .tx config
update dirs locations
add .gitignore
merge