flattened everything back into one file. Also introduced a better way of doing the credentials