code reorg
updated .gitignore