Moving SSPI slowly into new more oganized structure