Redid imports and added gitignore