rearranged packages; added .gitignore