Refactored Token and Logger services + authenticated policy. Simplifies #41