timeout while connecting implemented
renamed files
some refactorings