File source, logger, sample creds
Some renames