Improved a bit project templates