Minor re-org and getting login working
forgot dependencies