Musaafir staying in a place with the intention of leaving before 15 days

I have travelled with my family safar distance to a major city with many suburbs within it, we will be staying in the madressa property in this city, for 2 months and then returning to our town.

We are already here 2 weeks. I never intended staying in the madressa for full 15 days as yet, as i was trying to take out a 3 days jamaat over the weekend, and spending time with this jamaat in another suburb of this big city.

Over the past 2 weekends the jamaat did not materialise and I still have intention to take it out next weekend.

Therefore I still do not have the niyyat yet to stay inside the madressa property for 15 days. However, as from tomorrow it will be that i already stayed 15 full days in the madressa (though not intending it).

1. Am i a musaafir or muqeem?

And what was I all these days?

2. Also what is the general masla regarding big cities with different suburbs? Are they regarded as one big place or different places when it comes to musaafir and muqeem.