* implement individual instances
* reorganize files/templates