improved directory structure and added some templates