Refactored dir structure, build bouquets template