Changed AuthenticationHandler namespace and cleanup