Got into bootable state. More restructuring