Shuffle project structure, add second template example.