comments #2 - some restructure and cleanup

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
Merge branch 'authentication' into develop