Cleaned up .gitignore, changed transitional package filenames.