Restructure self host