Re-organize spec directory