More modularity fixes, initial templates