Tax question about office

We own this property and have used it as a rental property since we bought it. The last tenant was evicted, and it needed a lot of work done. After finishing up we decided to move our office into this property. Do capital improvements and other expenses go under it as a rental property until we moved in and then it will switch to office expenses? I'm not sure how to go about that.

posted