refactor of unity container config + cleaning up default template