Setup specs; some reorganization