Dear client, I proposed 2 alternatives for the bedroom layout, all with minimal changes to your current layout. You can add more closet at the bedroom beside the bathroom but I'm not really sure if you really want that many closet. Though you can let me know if you do.
Thank you and have a great day.