Cleanup for new architecture
Adds sample API

To be refactored with proper User data model