organise imports; modified gitignore