Refactor locations in seperate directories

The locations are seperated the directories specified in the
glife.qproj, which has been slightly updated with missing entries and
cleaned up. The scripts txtmerge.py and txtsplit3.py have been updated
to reflect these changes.

glife.qproj

@@ -69,7 +69,7 @@
     <Folder name="Accessories">
       <Location name="purses"/>
       <Location name="$purse_image"/>
-	  <Location name="sewing"/>
+	    <Location name="sewing"/>
     </Folder>
     <Folder name="Stats">
       <Location name="DNA"/>
@@ -127,7 +127,7 @@
       <Location name="cafe3"/>
       <Location name="ParkKafe"/>
       <Location name="succubus"/>
-      <Location name="serpent"/>
+      <Location name="Serpent"/>
     </Folder>
     <Folder name="Prehistory">
       <Location name="preSYS"/>
@@ -152,7 +152,7 @@
       <Location name="npc_intro"/>
       <Location name="npc_age"/>
       <Location name="saveupdater"/>
-	  <location name="NPCChanger"/>
+	    <location name="NPCChanger"/>
     </Folder>
     <Folder name="Combat">
       <Location name="fight"/>
@@ -358,7 +358,7 @@
     </Folder>
     <Folder name="Brother porn">
       <Location name="brother"/>
-	  <Location name="brother_voyeur"/>
+	    <Location name="brother_voyeur"/>
       <Location name="seeporn"/>
       <Location name="brosh"/>
       <Location name="porn_view"/>
@@ -386,14 +386,14 @@
     </Folder>
     <Folder name="Artem Chebotarev">
       <Location name="artemEv"/>
-      <Location name="artemEv3"/>
+      <Location name="ArtemEv3"/>
       <Location name="artemhome"/>
       <Location name="artemev2"/>
       <Location name="artgar"/>
     </Folder>
     <Folder name="Igor Kruglov">
       <Location name="IgorEv"/>
-      <Location name="igorhome"/>
+      <Location name="Igorhome"/>
     </Folder>	  
     <Folder name="Katja Meynold">
       <Location name="katjaEv"/>
@@ -406,6 +406,7 @@
     <Folder name="Vika Meynold">
       <Location name="mey_home"/>
       <Location name="mey_vika_events"/>
+      <Location name="mey_vika_strings"/>
       <Location name="mey_tamara_events"/>
     </Folder>
     <Folder name="Niko Volkov">
@@ -513,7 +514,7 @@
       <Location name="soniaDisco"/>
       <Location name="gkafe"/>
       <Location name="motherkafeboss"/>
-      <Location name="glake"/>
+      <Location name="gLake"/>
       <Location name="gLakeNude"/>
       <Location name="gLakeNudeEvent"/>
       <Location name="gLakeNudeForest"/>
@@ -811,7 +812,7 @@
       <Location name="pornstudio"/>
       <Location name="pornfilm"/>
       <Location name="pornhist"/>
-	  <Location name="pornschedule"/>
+	    <Location name="pornschedule"/>
     </Folder>
     <Folder name="Boys">
       <Location name="BDman"/>
@@ -921,9 +922,9 @@
       <Location name="roulette"/>
       <Location name="rate"/>
       <Location name="hall"/>
-	  <Location name="blackjackPlay"/>
-	  <Location name="blackjackView"/>
-	  <Location name="deckShuffle"/>
+	    <Location name="blackjackPlay"/>
+	    <Location name="blackjackView"/>
+	    <Location name="deckShuffle"/>
     </Folder>
     <Folder name="Menu">
       <Location name="Menu.Info"/>
@@ -985,19 +986,20 @@
       <Location name="husb"/>
       <Location name="husbSex"/>
       <Location name="indik"/>
-	  <Location name="indiktab"/>
+	    <Location name="indiktab"/>
       <Location name="Peterroom"/>
       <Location name="portnoi"/>
       <Location name="portnoi2"/>
       <Location name="sexorg"/>
       <Location name="shortgs"/>
-	  <Location name="$stock_item_info"/>
+	    <Location name="$stock_item_info"/>
       <Location name="$stock_item"/>
       <Location name="$single_stock_item"/>
       <Location name="$buy_item"/>
       <Location name="$buy_single_item"/>
       <Location name="$face_image"/>
       <Location name="$body_image"/>
+      <Location name="cumarrput"/>
     </Folder>
     <Folder name="Female wrestling">
       <Location name="generation"/>
@@ -1088,7 +1090,8 @@
   		<Location name="cum_cleanup"/>
   		<Location name="cum_call"/>
   		<Location name="pregriskeval"/>
-  		<Location name="cuminsidereact"/>
+      <Location name="cuminsidereact"/>
+      <Location name="sexcontraprio"/>
     </Folder>
     <Folder name="Ibiza">
   		<Location name="IbizaStart"/>

locations/sewing → locations/Accessories/sewing

@@ -76,4 +76,5 @@ end
 
 !!tovarL
 !!sewng_exp += rand(pcs_intel/20, pcs_intel/10)
---- sewing ---------------------------------
+--- sewing ---------------------------------
+

locations/brother_voyeur → locations/Brother porn/brother_voyeur

@@ -3325,4 +3325,5 @@ if $ARGS[0] = 'anatomylesson4':
 end
 
 !!if $ARGS[0] = 'anatomylesson_uterus':
---- brother_voyeur ----------------------------------
+--- brother_voyeur ----------------------------------
+