Update gitignore, setup.py, reorganize for package resolution