Update gitignore
Update package structures