You can check with HDB whether the area outside you living room can be purchased, so it will have a straight line from bedroom to the living room for corridor, and you will have more space to craft out the bedroom beside another bedroom. and shift the front door to the other side.