Here is my proposed architectural re-planning of your apartment.
* If you want to have two entrances to the apartment, you can make the hall between the bedrooms larger. The master bedroom will be smaller. But it is possible in my variant.