update gitignore
adding "discovered" requirements to stage 1
tidy imports and rename scripts