Rearrange templates to clean up the template dir.
working towards calendar import via user profile.
Test harness for API (needed as tokens now in database)