Merge pull request #209 from akkie/master

Add CacheAuthenticatorDAO
Rename packages and rearrange the structure