code restructuring
. .gitignore update