fixed login routing
restructure