restructure begun
preparing templates
Prepared tests for updated janitor