Architecture spec initial, folder changes