Maid: Images folder structure update

locations/nichApartment.qsrc

@@ -35,7 +35,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 	
 	gs 'stat'
 	'<center><b>Nicholas'' Apartment</b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/apartment/hallway.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nichApartment/hallway.jpg"></center>'
 		
 	'You are standing in a luxurious and spacious city center home.'
 	
@@ -226,7 +226,7 @@ elseif $ARGS[0] = 'jobInterview':
 		'"Good luck, Miss." he says before the doors close.'
 		act 'Wait':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/city/nicholas/tanya/01.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/city/tanya/01.jpg"></center>'
 			'Finally the elevator stops and the its doors open.'
 			
 			if nichTanyaOpinion = 0:
@@ -251,7 +251,7 @@ elseif $ARGS[0] = 'hiring':
 		nichHireMode = 2
 	end
 	
-	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/nicholas/01.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/01.jpg"></center>'
 	'Tanya leads you into the living room. Nicholas, her step-father, and her mother Gala are already sitting there.'
 	
 	
@@ -360,7 +360,7 @@ elseif $ARGS[0] = 'hiring':
 			*clr & cla
 			$loc = 'nichBedroomServant'
 			if nichHireMode = 2:
-				'<center><img <<$set_imgh>> src="images/characters/city/nicholas/tanya/bedroom_servant(0).jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/city/tanya/bedroom_servant(0).jpg"></center>'
 			end
 			'She leads you to your new room.'
 			'It has a small double bed, a wardrobe, a desk and enough free space for doing excercises. A door leads to your personal bathroom.'
@@ -455,7 +455,7 @@ elseif $ARGS[0] = 'visitTanya':
 			act 'Have sex with Tanya': gt 'nichTanya', 'sexL'
 		end
 	elseif nichTanyaFuckCounter > rand(3,5) and nichJobRefused ! 1 and nichWork = 0:
-		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/tanya/door_01.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/tanya/door_01.jpg"></center>'
 		'Tanya opens the door for you. As you look into her eyes, they seem to be sparkling with excitement, and her entire face lights up as she smiles at you.'
 		'"<<$pcs_nickname>>, it''s so good you are here. I have the best idea ever! Our maid left us recently, and my stepfather is looking for a replacement. I could suggest <b>you</b> to him! He pays really well, and all you gotta do is tidy up a bit, but you would be able to live right here with us!"'
 		'Tanya is so giddy that you almost don''t dare to voice your concerns: "And where do you get the idea that your stepfather would employ me? I''ve never worked as a maid before and I''m sure that, with his kind of money, he could get a much better one."'
@@ -526,7 +526,7 @@ elseif $ARGS[0] = 'visitTanya':
 			end
 		end
 	else
-		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/tanya/door_01.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/tanya/door_01.jpg"></center>'
 		if nichJobRefusedTReact = 1:
 			'Tanya opens the door looking angrily at you. "You got some nerve showing up like nothing happened, <<$pcs_nickname>>! Do you even realize how I felt after you changed your mind about working for us in the very last second?!"'
 			'She bites down on her lip. Apparently her lust for you is bigger than her anger.'

locations/nichBathGuest.qsrc

@@ -17,7 +17,7 @@ gs 'themes', 'indoors'
 !! Argument return: PC has been in the room before, dont perform actions meant to be executed before or as she enters the room.
 if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 	'<center><b><font color="maroon">Guest Cloakroom</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/apartment/bathroomGuest.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nichApartment/bathroomGuest.jpg"></center>'
 	'This is the restroom for the guests of Nicholas and his family. The staff is also allowed to use it.'
 	'You could use the <a href="exec:gt ''mirror'', ''start''">mirror</a> to check your appearance.'
 

locations/nichBathMaster.qsrc

@@ -15,7 +15,7 @@ gs 'themes', 'indoors'
 !! Argument return: PC has been in the room before, dont perform actions meant to be executed before or as she enters the room.
 if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 	'<center><b><font color="maroon">Nicholas'' Bathroom</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/apartment/bathroomMaster.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nichApartment/bathroomMaster.jpg"></center>'
 	'The bathroom is modern and well fitted, more than matching the display of wealth in the other rooms, from the elaborate decorations and spacious shower and tub to the underfloor heating.' 
 	if nichWork = 2:
 		'You have your own bathroom and should not use this one.'

locations/nichBathServant.qsrc

@@ -17,7 +17,7 @@ gs 'themes', 'indoors'
 !! Argument return: PC has been in the room before, dont perform actions meant to be executed before or as she enters the room.
 if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 	'<center><b><font color="maroon">Servant Bathroom</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/apartment/bathroomServant.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nichApartment/bathroomServant.jpg"></center>'
 	'This is the servants bathroom. It includes a shower, a toilet and a sink. There is a washing machine standing in one corner of the room.' 
 
 

locations/nichBedroomMaster.qsrc

@@ -32,7 +32,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 	end
 
 	'<center><b>Nicholas'' Master Bedroom</b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/apartment/bedroomMaster.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nichApartment/bedroomMaster.jpg"></center>'
 	''
 	'This is where Nicholas and his wife sleep. There''s a king-sized bed with matching bedside tables and lamps, a make-up table covered with bottles of expensive perfume, make-up and jewelry, a wall mirror with filigree gold ornaments and an entire wall is dominated by several solid wood wardrobes that look like they must have cost a fortune. Another small door leads to another walk-in wardrobe.'
 
@@ -87,28 +87,28 @@ elseif $ARGS[0] = 'evtGalaMast1':
 	end
 	act 'Spy':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/masturbation/mast(1).jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/gala/masturbation/mast(1).jpg"></center>'
 		!! todo: all the descriptions
 		evtGalaMast1 = 1
 		act 'Continue spying':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/masturbation/mast(0).jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/city/gala/masturbation/mast(0).jpg"></center>'
 			!! todo: all the descriptions
 			act 'Continue spying':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/masturbation/mast(2).jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/city/gala/masturbation/mast(2).jpg"></center>'
 				!! todo: all the descriptions
 				act 'Continue spying':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/masturbation/mast(5).jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/city/gala/masturbation/mast(5).jpg"></center>'
 					!! todo: all the descriptions
 					act 'Continue spying':
 						*clr & cla
-						'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/masturbation/mast(4).jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/city/gala/masturbation/mast(4).jpg"></center>'
 						!! todo: all the descriptions
 						act 'Continue spying':
 							*clr & cla
-							'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/masturbation/mast(3).jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/characters/city/gala/masturbation/mast(3).jpg"></center>'
 							'Gala opens her eyes and briefly looks in your direction. It only lasts for a split second but you feel as if she might know that you watched her masturbating.'
 							act 'Leave':
 								gt 'nichApartment', 'return'

locations/nichBedroomServant.qsrc

@@ -28,7 +28,7 @@ end
 if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 	gs 'stat'
 	'<center><b>Your Bedroom in Nicholas'' Apartment</b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/apartment/bedroomServant.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nichApartment/bedroomServant.jpg"></center>'
 
 	'Your bedroom is fairly large, considering you''re only an employee. There is a small <a href="exec:gt ''bed'', ''start''">double bed</a> and an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a>.'
 	'Half a wall is taken up by an expensive-looking <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing). There''s a make-up table with a <a href="exec:gt ''mirror'', ''start''">mirror</a> next to it.'
@@ -155,7 +155,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 	
 elseif $ARGS[0] = 'evtBodyguardIntim1':
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/bodyguard/evtBodyguardIntim1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/city/taras/encounter1.jpg"></center>'
 	'Before you have the chance to leave your room you get pushed back inside by a man you don''t know yet.'
 	'Taken by surpise you can only gasp as he painfully turns your right arm around, forcing you into a bent over position.'
 	'He obviously knows what he is doing. He has expertly fixated you with just one hand, leaving you next to no room to move.'
@@ -183,7 +183,7 @@ elseif $ARGS[0] = 'evtBodyguardIntim1':
 	end
 elseif $ARGS[0] = 'desk':
 	if nichGalaOpponent = 21:
-		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/necklace.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/gala/necklace.jpg"></center>'
 		'You open your desk. Something doesn''t seem to be right. After closer investigation you find Galas missing necklace hidden under some of your items.'
 		act 'Leave it there':
 			gt 'stol','start'

locations/nichBedroomTanja.qsrc

@@ -16,7 +16,7 @@ gs 'stat'
 !! Argument return: PC has been in the room before, dont perform actions meant to be executed before or as she enters the room.
 if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 	'<center><b>Tanya''s Room</b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/apartment/bedroomTanja.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nichApartment/bedroomTanja.jpg"></center>'
 	*nl
 	'This room belongs to <a href="exec: gt ''nichTanya'', ''desc''">Tanya</a>, Nicholas'' stepdaughter. While she is a little bit selfish, quick-tempered and spoiled, her heart seems to be in the right place.'
 	'Her room is usually in a state of chaos - typical for somebody who''s gotten used to others cleaning up after them - but otherwise displays the warmth and mix of colors you would expect of a woman who is still trying to figure herself out and doesn''t worry too much about the future.'

locations/nichChore.qsrc

@@ -33,18 +33,18 @@ if $ARGS[0] = 'inspect':
 		nichTimeBDiligent	= 30
 		
 		if nichChoreState[nichChoreID] = 0:
-			$nichTempPic = 'images/characters/city/nicholas/apartment/hallway.jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/hallway.jpg'
 			$nichChoreDesc = 'The hallway has been cleaned recently. There is no need to clean it again.'
 		elseif nichChoreState[nichChoreID] <= 5:
-			$nichTempPic = 'images/characters/city/nicholas/misc/hallwayDirt(1).jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/hallwayDirt(1).jpg'
 			$nichChoreDesc = 'The floor is a little bit dirty.'
 		elseif nichChoreState[nichChoreID] <= 15:
 			nichChoreTimeF = 2
-			$nichTempPic = 'images/characters/city/nicholas/misc/hallwayDirt(2).jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/hallwayDirt(2).jpg'
 			$nichChoreDesc = 'The floor is somewhat dirty. One has to be careful not to step into the dirt.'
 		else
 			nichChoreTimeF = 4
-			$nichTempPic = 'images/characters/city/nicholas/misc/hallwayDirt(3).jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/hallwayDirt(3).jpg'
 			$nichChoreDesc = 'The floor is very dirty. Wearing shoes here would be wise because otherwise hosiery could be ruined.'
 		end
 		
@@ -63,18 +63,18 @@ if $ARGS[0] = 'inspect':
 		nichTimeBDiligent	= 30
 		
 		if nichChoreState[nichChoreID] = 0:
-			$nichTempPic = 'images/characters/city/nicholas/apartment/bathroomGuest.jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/bathroomGuest.jpg'
 			$nichChoreDesc = 'The cloakroom hasn''t been used since it was last cleaned. There are no used towels in the basket, the end of the toilet paper is folded and the sink is in pristine condition. There is no need to clean up.'
 		elseif nichChoreState[nichChoreID] <= 5:
-			$nichTempPic = 'images/characters/city/nicholas/misc/bathGuestDirt(1).jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/bathGuestDirt(1).jpg'
 			$nichChoreDesc = 'Judging from a used towel being in the towel basket and some tiny splashes of water somebody has used this room lately. Although it being very clean Nicholas surely expects you to clean it.'
 		elseif nichChoreState[nichChoreID] <= 15:
 			nichChoreTimeF = 2
-			$nichTempPic = 'images/characters/city/nicholas/misc/bathGuestDirt(2).jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/bathGuestDirt(2).jpg'
 			$nichChoreDesc = 'This room has been used several times since it has been cleaned for the last time. The sink is somewhat dirty, the toilet paper needs to be filled up and the fresh towels are nearly used up.'
 		else
 			nichChoreTimeF = 4
-			$nichTempPic = 'images/characters/city/nicholas/misc/bathGuestDirt(3).jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/bathGuestDirt(3).jpg'
 			$nichChoreDesc = 'This room is dirty, which can not only be seen but also smelled. The toilet paper is used up, the sink has some water, soap and hair in it and the toilet hasn''t been flushed correctly.'
 		end
 		
@@ -93,18 +93,18 @@ if $ARGS[0] = 'inspect':
 		nichTimeBDiligent	= -1
 		
 		if nichChoreState[nichChoreID] = 0:
-			$nichTempPic = 'images/characters/city/nicholas/apartment/bedroomServant.jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/bedroomServant.jpg'
 			$nichChoreDesc = 'Your room is all cleaned up. Everything is at its place, the bed is tidied up and there is no visible dust on the furniture.'
 		elseif nichChoreState[nichChoreID] <= 5:
-			$nichTempPic = 'images/characters/city/nicholas/misc/bedServantDirty(1).jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/bedServantDirty(1).jpg'
 			$nichChoreDesc = 'Your room appears to be clean. You should make your bed though.'
 		elseif nichChoreState[nichChoreID] <= 15:
 			nichChoreTimeF = 2
-			$nichTempPic = 'images/characters/city/nicholas/misc/bedServantDirty(2).jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/bedServantDirty(2).jpg'
 			$nichChoreDesc = 'Some items are lying on the ground and your bed looks untidy.'
 		else
 			nichChoreTimeF = 4
-			$nichTempPic = 'images/characters/city/nicholas/misc/bedServantDirty(3).jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/bedServantDirty(3).jpg'
 			$nichChoreDesc = 'It appears as if most of your possessions are lying on the ground and your bed looks untidy. Also there is some visible dust on the shelves.'
 		end	
 		
@@ -123,18 +123,18 @@ if $ARGS[0] = 'inspect':
 		nichTimeBDiligent	= -1
 		
 		if nichChoreState[nichChoreID] = 0:
-			$nichTempPic = 'images/characters/city/nicholas/apartment/bathroomServant.jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/bathroomServant.jpg'
 			$nichChoreDesc = 'Apart from tiny inperfections you can''t avoid while using your shower and toilet your bathroom is perfectly clean.'
 		elseif nichChoreState[nichChoreID] <= 5:
-			$nichTempPic = 'images/characters/city/nicholas/misc/bathServantDirty(1).jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/bathServantDirty(1).jpg'
 			$nichChoreDesc = 'There is a small amount of lime in the shower and you should scrub the toilet. The floor could also use some cleaning.'
 		elseif nichChoreState[nichChoreID] <= 15:
 			nichChoreTimeF = 2
-			$nichTempPic = 'images/characters/city/nicholas/misc/bathServantDirty(2).jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/bathServantDirty(2).jpg'
 			$nichChoreDesc = 'Your beauty products appliances clutter your sink. In addition there is some amount of lime in the shower and you should scrub the toilet. The floor could also use some cleaning.'
 		else
 			nichChoreTimeF = 4
-			$nichTempPic = 'images/characters/city/nicholas/misc/bathServantDirty(3).jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/bathServantDirty(3).jpg'
 			$nichChoreDesc = 'The condition of this bathroom is worse than most truck stop restrooms. It smells badly and is in dire need of cleaning.'
 		end
 	
@@ -153,19 +153,19 @@ if $ARGS[0] = 'inspect':
 		nichTimeBDiligent	= 240
 		
 		if nichChoreState[nichChoreID] = 0:
-			$nichTempPic = 'images/characters/city/nicholas/misc/laundry(0).jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/laundry(0).jpg'
 			$nichChoreDesc = 'There is no laundry to do right now.'
 		elseif nichChoreState[nichChoreID] <= 15:
-			$nichTempPic = 'images/characters/city/nicholas/misc/laundry(1).jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/laundry(1).jpg'
 			$nichChoreDesc = 'A small pile of laundry lies in front of the washing machine. It is hardly enough to fill the machine halfway.'
 		elseif nichChoreState[nichChoreID] <= 25:
-			$nichTempPic = 'images/characters/city/nicholas/misc/laundry(2).jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/laundry(2).jpg'
 			$nichChoreDesc = 'A pile of laundry lies in front of the washing machine waiting to be washed.'
 		else nichChoreState[nichChoreID] <= 35:
-			$nichTempPic = 'images/characters/city/nicholas/misc/laundry(3).jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/laundry(3).jpg'
 			$nichChoreDesc = 'A big pile of laundry lies in front of the washing machine. You will have to fill the machine several times to get it all done.'
 		else
-			$nichTempPic = 'images/characters/city/nicholas/misc/laundry(4).jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/laundry(4).jpg'
 			$nichChoreDesc = 'The pile of laundry in front of the washing machine is enormous. It appears as if the majority of Nicholas'' clothes is here instead of his wardrobe.'
 		end
 		
@@ -185,18 +185,18 @@ if $ARGS[0] = 'inspect':
 		nichTimeBDiligent	= -1
 		
 		if nichChoreState[nichChoreID] = 0:
-			$nichTempPic = 'images/characters/city/nicholas/apartment/bedroomTanja.jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/bedroomTanja.jpg'
 			$nichChoreDesc = 'Tanyas room is cleaned up. There is no need to clean it again.'
 		elseif nichChoreState[nichChoreID] <= 5:
-			$nichTempPic = 'images/characters/city/nicholas/misc/tanyaDirty(1).jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/tanyaDirty(1).jpg'
 			$nichChoreDesc = 'The floor of Tanyas room is cleaned up, but she has cluttered her make-up all over her desk and her bed should be done.'
 		elseif nichChoreState[nichChoreID] <= 15:
 			nichChoreTimeF = 2
-			$nichTempPic = 'images/characters/city/nicholas/misc/tanyaDirty(2).jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/tanyaDirty(2).jpg'
 			$nichChoreDesc = 'Tanyas bed needs to be done and she has cluttered some of her dirty clothes all over her floor. You should put them into the laundry.'
 		else
 			nichChoreTimeF = 4
-			$nichTempPic = 'images/characters/city/nicholas/misc/tanyaDirty(3).jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/tanyaDirty(3).jpg'
 			$nichChoreDesc = 'Even entering Tanyas room is difficult since she has cluttered dirty and clean clothes all over the floor.'
 		end
 		
@@ -215,18 +215,18 @@ if $ARGS[0] = 'inspect':
 		nichTimeBDiligent	= 60
 		
 		if nichChoreState[nichChoreID] = 0:
-			$nichTempPic = 'images/characters/city/nicholas/apartment/bathroomMaster.jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/bathroomMaster.jpg'
 			$nichChoreDesc = 'Since the bathroom gets used over the day some tiny bits of spilled water and a small amount of untidiness can''t be avoided. There is no need for you to clean this bathroom now.'
 		elseif nichChoreState[nichChoreID] <= 5:
-			$nichTempPic = 'images/characters/city/nicholas/misc/bathMasterDirty(1).jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/bathMasterDirty(1).jpg'
 			$nichChoreDesc = 'There are various items cluttered around the sink, the floor could be cleaned and the bathtub could be scrubbed.'
 		elseif nichChoreState[nichChoreID] <= 15:
 			nichChoreTimeF = 2
-			$nichTempPic = 'images/characters/city/nicholas/misc/bathMasterDirty(2).jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/bathMasterDirty(2).jpg'
 			$nichChoreDesc = 'The floor is covered in water and lime, the bathtub needs to be scrubbed and the toilet and the sink also require attention.'
 		else
 			nichChoreTimeF = 4
-			$nichTempPic = 'images/characters/city/nicholas/misc/bathMasterDirty(3).jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/bathMasterDirty(3).jpg'
 			$nichChoreDesc = 'The bathroom is very dirty. There is also a unpleasant smell in the air.'
 		end	
 	elseif $ARGS[1] = 'master':
@@ -244,18 +244,18 @@ if $ARGS[0] = 'inspect':
 		nichTimeBDiligent	= -1
 		
 		if nichChoreState[nichChoreID] = 0:
-			$nichTempPic = 'images/characters/city/nicholas/apartment/bedroomMaster.jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/bedroomMaster.jpg'
 			$nichChoreDesc = 'The bedroom of Nicholas is in pristine condition. There is no need to clean it now.'
 		elseif nichChoreState[nichChoreID] <= 5:
-			$nichTempPic = 'images/characters/city/nicholas/misc/bedMasterDirty(1).jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/bedMasterDirty(1).jpg'
 			$nichChoreDesc = 'The bed of Nicholas need to be made. You could also sweep the floor.'
 		elseif nichChoreState[nichChoreID] <= 15:
 			nichChoreTimeF = 2
-			$nichTempPic = 'images/characters/city/nicholas/misc/bedMasterDirty(2).jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/bedMasterDirty(2).jpg'
 			$nichChoreDesc = 'There are some clothes cluttered over the floor. You should put them into the laundry. The bed also needs to be made.'
 		else
 			nichChoreTimeF = 4
-			$nichTempPic = 'images/characters/city/nicholas/misc/bedMasterDirty(3).jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/bedMasterDirty(3).jpg'
 			$nichChoreDesc = 'There are clothes cluttered over the floor and the bed. The bed needs to be made and you should clean the floor.'
 		end		
 	
@@ -274,18 +274,18 @@ if $ARGS[0] = 'inspect':
 		nichTimeBDiligent	= 120
 		
 		if nichChoreState[nichChoreID] = 0:
-			$nichTempPic = 'images/characters/city/nicholas/apartment/living.jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/living.jpg'
 			$nichChoreDesc = 'The living room of Nicholas is in pristine condition. There is no need to clean it now.'
 		elseif nichChoreState[nichChoreID] <= 5:
-			$nichTempPic = 'images/characters/city/nicholas/misc/livingDirty(1).jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/livingDirty(1).jpg'
 			$nichChoreDesc = 'Some whine glasses and other items are standing around the living room. You could also remove dust from the furniture and clean the floor.'
 		elseif nichChoreState[nichChoreID] <= 15:
 			nichChoreTimeF = 2
-			$nichTempPic = 'images/characters/city/nicholas/misc/livingDirty(2).jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/livingDirty(2).jpg'
 			$nichChoreDesc = 'A visible layer of dust covers the floor and some of the pieces of furniture.'
 		else
 			nichChoreTimeF = 4
-			$nichTempPic = 'images/characters/city/nicholas/misc/livingDirty(3).jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/livingDirty(3).jpg'
 			$nichChoreDesc = 'There are many clusters of hair and dust all over the living room. Shou need to clean the floor and the furniture.'
 		end	
 	elseif $ARGS[1] = 'kitchen':
@@ -303,18 +303,18 @@ if $ARGS[0] = 'inspect':
 		nichTimeBDiligent	= 120
 		
 		if nichChoreState[nichChoreID] = 0:
-			$nichTempPic = 'images/characters/city/nicholas/apartment/kitchen.jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/kitchen.jpg'
 			$nichChoreDesc = 'The kitchen is in pristine condition. There is no need to clean it now.'
 		elseif nichChoreState[nichChoreID] <= 5:
-			$nichTempPic = 'images/characters/city/nicholas/misc/kitchenDirty(1).jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/kitchenDirty(1).jpg'
 			$nichChoreDesc = 'There is some dirty dishes in the sink and the stove could use some cleaning.'
 		elseif nichChoreState[nichChoreID] <= 15:
 			nichChoreTimeF = 2
-			$nichTempPic = 'images/characters/city/nicholas/misc/kitchenDirty(2).jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/kitchenDirty(2).jpg'
 			$nichChoreDesc = 'A pile of dishes fills the sink and the sorrounding area. The floor could use some cleaning and the stove is pretty dirty.'
 		else
 			nichChoreTimeF = 4
-			$nichTempPic = 'images/characters/city/nicholas/misc/kitchenDirty(3).jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/kitchenDirty(3).jpg'
 			$nichChoreDesc = 'The kitchen is filled with dirty dishes. The stove is dirty and you should really clean up the floor. A bad smell is in the air.'
 		end	
 	elseif $ARGS[1] = 'study':
@@ -332,18 +332,18 @@ if $ARGS[0] = 'inspect':
 		nichTimeBDiligent	= 60
 		
 		if nichChoreState[nichChoreID] = 0:
-			$nichTempPic = 'images/characters/city/nicholas/apartment/study.jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/study.jpg'
 			$nichChoreDesc = 'The study is in pristine condition. There is no need to clean it now.'
 		elseif nichChoreState[nichChoreID] <= 5:
-			$nichTempPic = 'images/characters/city/nicholas/misc/studyDirty(1).jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/studyDirty(1).jpg'
 			$nichChoreDesc = 'Nicholas keeps his study in a tidy condition. Nevertheless there is a tiny amount of dust on the shelves.'
 		elseif nichChoreState[nichChoreID] <= 15:
 			nichChoreTimeF = 2
-			$nichTempPic = 'images/characters/city/nicholas/misc/studyDirty(2).jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/studyDirty(2).jpg'
 			$nichChoreDesc = 'A small amount of dust is on the shelves. You could also clean the keyboard of Nicholas '' computer.'
 		else
 			nichChoreTimeF = 4
-			$nichTempPic = 'images/characters/city/nicholas/misc/studyDirty(3).jpg'
+			$nichTempPic = 'images/locations/city/citycenter/nichApartment/studyDirty(3).jpg'
 			$nichChoreDesc = 'The furniture is covered in a thick layer of dust dust.'
 		end	
 	end

locations/nichCook.qsrc

@@ -2,7 +2,7 @@
 
 if $ARGS[0] = 'desc':
 	*clr
-	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/cook/cook.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/city/jegor/cook.jpg"></center>'
 	if nichKnowsCook = 0:
 		'The cook looks pretty old. You guess that he is at least in his late 60s.'
 		'When he notices you he looks up from his work.'

locations/nichGala.qsrc

@@ -8,7 +8,7 @@
 !! nichGalaTrainCounter
 
 if $ARGS[0] = 'start' or $ARGS[0] = '':
-	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/02.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/city/gala/02.jpg"></center>'
 	
 	$nichTemp = func('nichUtil','npcActivity','gala')
 	
@@ -44,7 +44,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	end
 
 elseif $ARGS[0] = 'approach':
-	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/02.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/city/gala/02.jpg"></center>'
 	'You wait for Gala to notice you, then you approach her and curtsy.'
 	'"<<$pcs_nickname>>, what is it?"'
 	
@@ -111,7 +111,7 @@ elseif $ARGS[0] = 'training':
 		end
 	elseif nichGalaTrainStage = 1:
 		minut += 5
-		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/training/training(1).jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/gala/training/training(1).jpg"></center>'
 		'When Gala returns she wears some kind of purple fetish wear. Her legs are covered by overkness while her breasts and privates are exposed.'
 		'"Open your mouth, slut!"'
 		'You do as commanded and she pushes a black ballgag behind your lips and locks it behind your head.'
@@ -128,7 +128,7 @@ elseif $ARGS[0] = 'training':
 		end
 	elseif nichGalaTrainStage = 10:
 		minut += 1
-		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/training/training(36).jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/gala/training/training(36).jpg"></center>'
 		'"A maids life is often full of inconveniences and even pain."'
 		'She collects a few clothes pegs from the small table.'
 		act 'Further':
@@ -137,7 +137,7 @@ elseif $ARGS[0] = 'training':
 		end
 	elseif nichGalaTrainStage = 11:
 		minut += 1
-		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/training/training(2).jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/gala/training/training(2).jpg"></center>'
 		'"I will help you deal with this."'
 		'Stars massaging your exposed nipples.'
 		'"I will make sure you develop a tolerance for pain."'
@@ -153,7 +153,7 @@ elseif $ARGS[0] = 'training':
 		end
 	elseif nichGalaTrainStage = 12:
 		minut += 1
-		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/training/training(42).jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/gala/training/training(42).jpg"></center>'
 		'"You should be glad it''s me who is training you. Other trainers would go slow on you, but I believe in quick progress."'
 		'She attaches the other two clothes pegs to your labia and pulls them a few times, making sure they rest painfully.'
 		act 'Further':
@@ -162,7 +162,7 @@ elseif $ARGS[0] = 'training':
 		end
 	elseif nichGalaTrainStage = 20:
 		minut += 1
-		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/training/training(37).jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/gala/training/training(37).jpg"></center>'
 		!!TODO: Text
 		act 'Further':
 			nichGalaTrainStage = 21
@@ -170,7 +170,7 @@ elseif $ARGS[0] = 'training':
 		end
 	elseif nichGalaTrainStage = 21:
 		minut += 1
-		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/training/training(39).jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/gala/training/training(39).jpg"></center>'
 		!!TODO: Text
 		act 'Further':
 			nichRand = rand (1,3)
@@ -185,7 +185,7 @@ elseif $ARGS[0] = 'training':
 		end
 	elseif nichGalaTrainStage = 22:
 		minut += 1
-		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/training/training(45).jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/gala/training/training(45).jpg"></center>'
 		!!TODO: Text
 		act 'Further':
 			nichGalaTrainStage = 40
@@ -193,7 +193,7 @@ elseif $ARGS[0] = 'training':
 		end
 	elseif nichGalaTrainStage = 23:
 		minut += 1
-		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/training/training(14).jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/gala/training/training(14).jpg"></center>'
 		!!TODO: Text
 		act 'Further':
 			nichGalaTrainStage = 40
@@ -201,7 +201,7 @@ elseif $ARGS[0] = 'training':
 		end
 	elseif nichGalaTrainStage = 30:
 		minut += 1
-		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/training/training(46).jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/gala/training/training(46).jpg"></center>'
 		!!TODO: Text
 		act 'Further':
 			nichRand = rand (1,3)
@@ -214,7 +214,7 @@ elseif $ARGS[0] = 'training':
 		end
 	elseif nichGalaTrainStage = 31:
 		minut += 1
-		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/training/training(47).jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/gala/training/training(47).jpg"></center>'
 		!!TODO: Text
 		act 'Further':
 			nichRand = rand (1,3)
@@ -227,7 +227,7 @@ elseif $ARGS[0] = 'training':
 		end
 	elseif nichGalaTrainStage = 32:
 		minut += 1
-		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/training/training(13).jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/gala/training/training(13).jpg"></center>'
 		!!TODO: Text
 		act 'Further':
 			nichGalaTrainStage = 40
@@ -235,7 +235,7 @@ elseif $ARGS[0] = 'training':
 		end
 	elseif nichGalaTrainStage = 40:
 		minut += 1
-		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/training/training(38).jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/gala/training/training(38).jpg"></center>'
 		nichRand = rand(1,5)
 		if nichGalaTrainCounter < 4 or nichRand = 1:
 			'"I think this was enough for today."'
@@ -261,7 +261,7 @@ elseif $ARGS[0] = 'training':
 		end
 	elseif nichGalaTrainStage = 50:
 		minut += 1
-		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/training/training(12).jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/gala/training/training(12).jpg"></center>'
 		'She grabs your head and pulls it towards her vagina. You can smell her sex. From the amount of juice running down Galas inner thighs she is very turned on.'
 		'She clearly expects you to start licking. And from your current position there is nothing you can do than obey.'
 		'You start licking and before long you hear Galas moans getting louder. As she nears an orgams she grabs your head and pulls it closer.'
@@ -271,13 +271,13 @@ elseif $ARGS[0] = 'training':
 		xgt 'nichGala','trainingEnd'
 	elseif nichGalaTrainStage = 51:
 		minut += 1
-		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/training/training(11).jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/gala/training/training(11).jpg"></center>'
 		!!TODO: Text
 		nichEvalGala = 2
 		xgt 'nichGala','trainingEnd'
 	elseif nichGalaTrainStage = 60:
 		minut += 1
-		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/training/training(20).jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/gala/training/training(20).jpg"></center>'
 		'She puts on a strapon.'
 		'Then she grabs your hair, pulls you from the chair and forces you to your knees.'
 		'"I know you are a cock-hungry slut. I am sure you will enjoy this."'
@@ -287,82 +287,82 @@ elseif $ARGS[0] = 'training':
 		end
 	elseif nichGalaTrainStage = 61:
 		minut += 1
-		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/training/training(18).jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/gala/training/training(18).jpg"></center>'
 		act 'Further':
 			nichGalaTrainStage = 62
 			gt 'nichGala', 'training'
 		end
 	elseif nichGalaTrainStage = 62:
 		minut += 1
-		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/training/training(19).jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/gala/training/training(19).jpg"></center>'
 		act 'Further':
 			nichGalaTrainStage = 63
 			gt 'nichGala', 'training'
 		end
 	elseif nichGalaTrainStage = 63:
 		minut += 1
-		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/training/training(21).jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/gala/training/training(21).jpg"></center>'
 		act 'Further':
 			nichGalaTrainStage = 64
 			gt 'nichGala', 'training'
 		end
 	elseif nichGalaTrainStage = 64:
 		minut += 1
-		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/training/training(30).jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/gala/training/training(30).jpg"></center>'
 		act 'Further':
 			nichGalaTrainStage = 65
 			gt 'nichGala', 'training'
 		end
 	elseif nichGalaTrainStage = 65:
 		minut += 1
-		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/training/training(57).jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/gala/training/training(57).jpg"></center>'
 		act 'Further':
 			nichGalaTrainStage = 66
 			gt 'nichGala', 'training'
 		end
 	elseif nichGalaTrainStage = 66:
 		minut += 1
-		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/training/training(32).jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/gala/training/training(32).jpg"></center>'
 		nichEvalGala = 2
 		xgt 'nichGala','trainingEnd'
 	elseif nichGalaTrainStage = 70:
 		minut += 1
-		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/training/training(62).jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/gala/training/training(62).jpg"></center>'
 		act 'Further':
 			nichGalaTrainStage = 71
 			gt 'nichGala', 'training'
 		end
 	elseif nichGalaTrainStage = 71:
 		minut += 1
-		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/training/training(28).jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/gala/training/training(28).jpg"></center>'
 		act 'Further':
 			nichGalaTrainStage = 72
 			gt 'nichGala', 'training'
 		end
 	elseif nichGalaTrainStage = 72:
 		minut += 1
-		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/training/training(54).jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/gala/training/training(54).jpg"></center>'
 		act 'Further':
 			nichGalaTrainStage = 73
 			gt 'nichGala', 'training'
 		end
 	elseif nichGalaTrainStage = 73:
 		minut += 1
-		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/training/training(26).jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/gala/training/training(26).jpg"></center>'
 		act 'Further':
 			nichGalaTrainStage = 74
 			gt 'nichGala', 'training'
 		end
 	elseif nichGalaTrainStage = 74:
 		minut += 1
-		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/training/training(25).jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/gala/training/training(25).jpg"></center>'
 		act 'Further':
 			nichGalaTrainStage = 75
 			gt 'nichGala', 'training'
 		end
 	elseif nichGalaTrainStage = 75:
 		minut += 1
-		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/training/training(56).jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/gala/training/training(56).jpg"></center>'
 		nichEvalGala = 2
 		xgt 'nichGala','trainingEnd'
 	end
@@ -375,7 +375,7 @@ elseif $ARGS[0] = 'trainingEnd':
 		gt 'nichApartment'
 	end
 elseif $ARGS[0] = 'desc':
-	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/gala/02.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/city/gala/02.jpg"></center>'
 	'Gala is the wife of Nicholas and the mother of Tanya.'
 	if nichGalaOpinion = 0:
 		'She seems to be pretty indifferent about you.'

locations/nichKitchen.qsrc

@@ -21,7 +21,7 @@ gs 'boyStat', 'A161', 'a'
 if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 
 	'<center><b>Nicholas'' Kitchen</b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/apartment/kitchen.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nichApartment/kitchen.jpg"></center>'
 	*nl
 	'The kitchen has a sleek, contemporary design with lots of metal and polished wood - black, white and gray dominate the room''s color scheme and all appliances and additional furniture in it adhere to this order.'
 	'It seems to house every kitchen device known to man - all of them the most expensive variant of their kind - and the fridge and freezer cabinet are filled to the top with fresh food. There''s also a refrigerated wine rack, stocked with bottle upon bottle of reds and whites of the finest vintages.'

locations/nichLivingroom.qsrc

@@ -35,7 +35,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 	end
 
 	'<center><b>Nicholas'' Living Room</b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/apartment/living.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nichApartment/living.jpg"></center>'
 
 	'The living room is furnished with finest leather couches of modern design, a fireplace, a large TV on the wall, several side tables and a cabinet and fridge for various expensive alcoholic beverages.'
 	'Just like every other room in the apartment, it serves to convey to anybody who enters that Nicholas and his family are doing really well financially.'
@@ -192,7 +192,7 @@ elseif $ARGS[0] = 'breakfast':
 		nichTemp = 8
 	end
 	
-	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/misc/breakfast('+rand(0,5)+').jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nichApartment/breakfast('+rand(0,5)+').jpg"></center>'
 	if hour < nichTemp or (hour = nichTemp and minut <= 15):
 		'You have enough time to prepare breakfast. You make coffee, collect the newspaper from the mailbox and place everything on the dinner table.'
 		'When the family members arrive one by one the breakfast table if prepared perfectly and you stand ready to fullfill additional requests.'

locations/nichNicholas.qsrc

@@ -8,7 +8,7 @@
 
 
 if $ARGS[0] = 'start' or $ARGS[0] = '':
-	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/nicholas/01.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/01.jpg"></center>'
 	
 	$nichTemp = func('nichUtil','npcActivity','nicholas')
 	
@@ -53,7 +53,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	
 	
 elseif $ARGS[0] = 'approach':
-	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/nicholas/01.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/01.jpg"></center>'
 	'You wait for Nicholas to notice you, then you approach him and curtsy.'
 	'"<<$pcs_nickname>>, what do you want?"'
 	if nichEvaluationLast ! daystart:
@@ -108,18 +108,18 @@ elseif $ARGS[0] = 'sex':
 	if $ARGS[1] = '' or $ARGS[1] = 'start':
 		gs 'boyStat', 'A52'
 		
-		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/nicholas/sex/undress.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/sex/undress.jpg"></center>'
 		'You slowly undress for Nicholas.'
 		
 		!! Nicholas will cum at 5
 		nichTemp = 1
 	
 	elseif $ARGS[1] = 'bj':
-		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/nicholas/sex/bj/bj('+rand(0,10)+').jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/sex/bj/bj('+rand(0,10)+').jpg"></center>'
 		gs 'arousal', 'bj', 1
 		nichTemp += 1
 	elseif $ARGS[1] = 'anal':
-		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/nicholas/sex/anal/anal('+rand(0,7)+').jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/sex/anal/anal('+rand(0,7)+').jpg"></center>'
 		gs 'arousal', 'anal', 1
 		nichTemp += 1
 	end
@@ -157,7 +157,7 @@ elseif $ARGS[0] = 'sex':
 	
 	
 elseif $ARGS[0] = 'seduce':	
-	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/nicholas/sex/seduce.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/sex/seduce.jpg"></center>'
 	'"'+$npc_nickname['A52']+'? Is there anything I can do for you?"'
 	'You squeze your breast together, so that '+$npc_firstname['A52']+' has a good look at them.'
 	'"I mean <i>anything</i>."'
@@ -168,7 +168,7 @@ elseif $ARGS[0] = 'seduce':
 elseif $ARGS[0] = 'flirt':
 	nichFlirtLast = daystart
 	
-	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/nicholas/sex/flirt.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/sex/flirt.jpg"></center>'
 	
 	if nichSex < 10:
 		nichFlirtCounter += 1
@@ -228,7 +228,7 @@ elseif $ARGS[0] = 'flirt':
 		gt $loc, 'return'
 	end
 elseif $ARGS[0] = 'desc':
-	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/nicholas/01.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/01.jpg"></center>'
 	
 	$nichTemp = func('nichUtil','npcActivity','nicholas')
 	

locations/nichStudy.qsrc

@@ -15,7 +15,7 @@ gs 'boyStat', 'A161', 'a'
 !! Argument return: PC has been in the room before, dont perform actions meant to be executed before or as she enters the room.
 if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 	'<center><b>Nicholas'' Living Room</b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/apartment/study.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nichApartment/study.jpg"></center>'
 
 	nichNichPresent = FUNC('nichUtil','isPresent','nicholas','study')
 	

locations/nichTanya.qsrc

@@ -237,7 +237,7 @@ if $ARGS[0] = 'bedroomTanya':
 	end
 	
 elseif $ARGS[0] = 'desc':
-	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/tanya/01.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/city/tanya/01.jpg"></center>'
 	'Tanya is the daughter of Gala and the step-daughter of Nicholas.'
 	
 	

locations/nichUtil.qsrc

@@ -397,9 +397,9 @@ if $ARGS[0] = 'cleanPic':
 	
 	if ARRSIZE('$nichTempPic') = 0:
 		!!generic fallback in case no matching picture was found
-		$RESULT = 'images/characters/city/nicholas/maid/maid(0).jpg'
+		$RESULT = 'images/pc/activities/maidCleaning/maid(0).jpg'
 	else
-		$RESULT = 'images/characters/city/nicholas/maid/'+$nichTempPic[rand(0,ARRSIZE('$nichTempPic')-1)]
+		$RESULT = 'images/pc/activities/maidCleaning/'+$nichTempPic[rand(0,ARRSIZE('$nichTempPic')-1)]
 	end
 	'Debug: Picture '+$RESULT
 	!!killvar 'nichTemp'
@@ -414,7 +414,7 @@ end
 if $ARGS[0] = 'tanyaPic':
 	gs 'nichUtil','updatePcHair'
 
-	$nichTempFolder = 'images/characters/city/nicholas/tanya/'
+	$nichTempFolder = 'images/characters/city/tanya/'
 	
 	if $ARGS[1] = 'idle':
 		$RESULT = $nichTempFolder + 'idle/idle('+rand(0,5)+').jpg'