Moving credentials dir to be a flag and updating import paths