Cleanup
Add support for nested partial paths
Remove template renaming