fixed null loginUrl
dir reorg
dir reorg
Merge pull request #2 from olivier-squid/master

reorg