Hi attached is floor plan for a house with comments and furniture. I need redraw

Hi
attached is floor plan for a house with comments and furniture. I need redraw with some considerations:
1. change the dimensions of the floor from 15.7 * 25 to 12 * 25 so some changes in the width only.
2. second floor is apartment + roof. It should be full apartment with two entrenches and at least one master bedroom.
3. add the new floor for the roof + 50% building area.