Relocated some classes and fixed login provider.