OptCredentials added
Better specs
Some files renamed