Nap question

What are we doing for naps? I still have my 15 week old napping in the pack n play in my living room while the chaos of the day with my toddler goes on. Should she be in her room trying to nap soon? She’s in a bassinet in my bedroom at night. Starting to roll so probably getting her out of a bassinet soon but I need to buy a crib mattress!