Merge basic-spa with master (sibling extension)

Directory structured nicely to merge both