diff --git a/wgmaster/vba/Form_FAbschlaege.frm b/wgmaster/vba/form/Form_FAbschlaege.frm
similarity index 100%
rename from wgmaster/vba/Form_FAbschlaege.frm
rename to wgmaster/vba/form/Form_FAbschlaege.frm
diff --git a/wgmaster/vba/Form_FAllgemein.frm b/wgmaster/vba/form/Form_FAllgemein.frm
similarity index 100%
rename from wgmaster/vba/Form_FAllgemein.frm
rename to wgmaster/vba/form/Form_FAllgemein.frm
diff --git a/wgmaster/vba/Form_FAuszahlung.frm b/wgmaster/vba/form/Form_FAuszahlung.frm
similarity index 100%
rename from wgmaster/vba/Form_FAuszahlung.frm
rename to wgmaster/vba/form/Form_FAuszahlung.frm
diff --git a/wgmaster/vba/Form_FAuszahlungParameter.frm b/wgmaster/vba/form/Form_FAuszahlungParameter.frm
similarity index 100%
rename from wgmaster/vba/Form_FAuszahlungParameter.frm
rename to wgmaster/vba/form/Form_FAuszahlungParameter.frm
diff --git a/wgmaster/vba/Form_FAuszahlungSorten.frm b/wgmaster/vba/form/Form_FAuszahlungSorten.frm
similarity index 100%
rename from wgmaster/vba/Form_FAuszahlungSorten.frm
rename to wgmaster/vba/form/Form_FAuszahlungSorten.frm
diff --git a/wgmaster/vba/Form_FAuszahlungSortenAuswahl.frm b/wgmaster/vba/form/Form_FAuszahlungSortenAuswahl.frm
similarity index 100%
rename from wgmaster/vba/Form_FAuszahlungSortenAuswahl.frm
rename to wgmaster/vba/form/Form_FAuszahlungSortenAuswahl.frm
diff --git a/wgmaster/vba/Form_FAuszahlungSortenQualitätsstufe.frm b/wgmaster/vba/form/Form_FAuszahlungSortenQualitätsstufe.frm
similarity index 100%
rename from wgmaster/vba/Form_FAuszahlungSortenQualitätsstufe.frm
rename to wgmaster/vba/form/Form_FAuszahlungSortenQualitätsstufe.frm
diff --git a/wgmaster/vba/Form_FBanken.frm b/wgmaster/vba/form/Form_FBanken.frm
similarity index 100%
rename from wgmaster/vba/Form_FBanken.frm
rename to wgmaster/vba/form/Form_FBanken.frm
diff --git a/wgmaster/vba/Form_FBewirtschaftungsarten.frm b/wgmaster/vba/form/Form_FBewirtschaftungsarten.frm
similarity index 100%
rename from wgmaster/vba/Form_FBewirtschaftungsarten.frm
rename to wgmaster/vba/form/Form_FBewirtschaftungsarten.frm
diff --git a/wgmaster/vba/Form_FChargeUmfuellen.frm b/wgmaster/vba/form/Form_FChargeUmfuellen.frm
similarity index 100%
rename from wgmaster/vba/Form_FChargeUmfuellen.frm
rename to wgmaster/vba/form/Form_FChargeUmfuellen.frm
diff --git a/wgmaster/vba/Form_FChargen.frm b/wgmaster/vba/form/Form_FChargen.frm
similarity index 100%
rename from wgmaster/vba/Form_FChargen.frm
rename to wgmaster/vba/form/Form_FChargen.frm
diff --git a/wgmaster/vba/Form_FFlaechenbindungen.frm b/wgmaster/vba/form/Form_FFlaechenbindungen.frm
similarity index 100%
rename from wgmaster/vba/Form_FFlaechenbindungen.frm
rename to wgmaster/vba/form/Form_FFlaechenbindungen.frm
diff --git a/wgmaster/vba/Form_FGebiete.frm b/wgmaster/vba/form/Form_FGebiete.frm
similarity index 100%
rename from wgmaster/vba/Form_FGebiete.frm
rename to wgmaster/vba/form/Form_FGebiete.frm
diff --git a/wgmaster/vba/Form_FGebietshierarchie.frm b/wgmaster/vba/form/Form_FGebietshierarchie.frm
similarity index 100%
rename from wgmaster/vba/Form_FGebietshierarchie.frm
rename to wgmaster/vba/form/Form_FGebietshierarchie.frm
diff --git a/wgmaster/vba/Form_FGemeinden.frm b/wgmaster/vba/form/Form_FGemeinden.frm
similarity index 100%
rename from wgmaster/vba/Form_FGemeinden.frm
rename to wgmaster/vba/form/Form_FGemeinden.frm
diff --git a/wgmaster/vba/Form_FGrosslagen.frm b/wgmaster/vba/form/Form_FGrosslagen.frm
similarity index 100%
rename from wgmaster/vba/Form_FGrosslagen.frm
rename to wgmaster/vba/form/Form_FGrosslagen.frm
diff --git a/wgmaster/vba/Form_FLeseplanung.frm b/wgmaster/vba/form/Form_FLeseplanung.frm
similarity index 100%
rename from wgmaster/vba/Form_FLeseplanung.frm
rename to wgmaster/vba/form/Form_FLeseplanung.frm
diff --git a/wgmaster/vba/Form_FLiefermengen.frm b/wgmaster/vba/form/Form_FLiefermengen.frm
similarity index 100%
rename from wgmaster/vba/Form_FLiefermengen.frm
rename to wgmaster/vba/form/Form_FLiefermengen.frm
diff --git a/wgmaster/vba/Form_FLieferungAbschlag.frm b/wgmaster/vba/form/Form_FLieferungAbschlag.frm
similarity index 100%
rename from wgmaster/vba/Form_FLieferungAbschlag.frm
rename to wgmaster/vba/form/Form_FLieferungAbschlag.frm
diff --git a/wgmaster/vba/Form_FLieferungen.frm b/wgmaster/vba/form/Form_FLieferungen.frm
similarity index 100%
rename from wgmaster/vba/Form_FLieferungen.frm
rename to wgmaster/vba/form/Form_FLieferungen.frm
diff --git a/wgmaster/vba/Form_FMandant.frm b/wgmaster/vba/form/Form_FMandant.frm
similarity index 100%
rename from wgmaster/vba/Form_FMandant.frm
rename to wgmaster/vba/form/Form_FMandant.frm
diff --git a/wgmaster/vba/Form_FMitglieder.frm b/wgmaster/vba/form/Form_FMitglieder.frm
similarity index 100%
rename from wgmaster/vba/Form_FMitglieder.frm
rename to wgmaster/vba/form/Form_FMitglieder.frm
diff --git a/wgmaster/vba/Form_FQualitaetsstufen.frm b/wgmaster/vba/form/Form_FQualitaetsstufen.frm
similarity index 100%
rename from wgmaster/vba/Form_FQualitaetsstufen.frm
rename to wgmaster/vba/form/Form_FQualitaetsstufen.frm
diff --git a/wgmaster/vba/Form_FRegionen.frm b/wgmaster/vba/form/Form_FRegionen.frm
similarity index 100%
rename from wgmaster/vba/Form_FRegionen.frm
rename to wgmaster/vba/form/Form_FRegionen.frm
diff --git a/wgmaster/vba/Form_FRiede.frm b/wgmaster/vba/form/Form_FRiede.frm
similarity index 100%
rename from wgmaster/vba/Form_FRiede.frm
rename to wgmaster/vba/form/Form_FRiede.frm
diff --git a/wgmaster/vba/Form_FRiedeMitglied.frm b/wgmaster/vba/form/Form_FRiedeMitglied.frm
similarity index 100%
rename from wgmaster/vba/Form_FRiedeMitglied.frm
rename to wgmaster/vba/form/Form_FRiedeMitglied.frm
diff --git a/wgmaster/vba/Form_FSorten.frm b/wgmaster/vba/form/Form_FSorten.frm
similarity index 100%
rename from wgmaster/vba/Form_FSorten.frm
rename to wgmaster/vba/form/Form_FSorten.frm
diff --git a/wgmaster/vba/Form_FSortenkuerzelUmbenennen.frm b/wgmaster/vba/form/Form_FSortenkuerzelUmbenennen.frm
similarity index 100%
rename from wgmaster/vba/Form_FSortenkuerzelUmbenennen.frm
rename to wgmaster/vba/form/Form_FSortenkuerzelUmbenennen.frm
diff --git a/wgmaster/vba/Form_FTextelemente.frm b/wgmaster/vba/form/Form_FTextelemente.frm
similarity index 100%
rename from wgmaster/vba/Form_FTextelemente.frm
rename to wgmaster/vba/form/Form_FTextelemente.frm
diff --git a/wgmaster/vba/Form_FUebernahmeChargenauswahl.frm b/wgmaster/vba/form/Form_FUebernahmeChargenauswahl.frm
similarity index 100%
rename from wgmaster/vba/Form_FUebernahmeChargenauswahl.frm
rename to wgmaster/vba/form/Form_FUebernahmeChargenauswahl.frm
diff --git a/wgmaster/vba/Form_FUmrechnung.frm b/wgmaster/vba/form/Form_FUmrechnung.frm
similarity index 100%
rename from wgmaster/vba/Form_FUmrechnung.frm
rename to wgmaster/vba/form/Form_FUmrechnung.frm
diff --git a/wgmaster/vba/Form_FÜbernahme.frm b/wgmaster/vba/form/Form_FÜbernahme.frm
similarity index 100%
rename from wgmaster/vba/Form_FÜbernahme.frm
rename to wgmaster/vba/form/Form_FÜbernahme.frm
diff --git a/wgmaster/vba/Form_FÜbernahmeAbschlag.frm b/wgmaster/vba/form/Form_FÜbernahmeAbschlag.frm
similarity index 100%
rename from wgmaster/vba/Form_FÜbernahmeAbschlag.frm
rename to wgmaster/vba/form/Form_FÜbernahmeAbschlag.frm
diff --git a/wgmaster/vba/Form_MAbwertungen.frm b/wgmaster/vba/form/Form_MAbwertungen.frm
similarity index 100%
rename from wgmaster/vba/Form_MAbwertungen.frm
rename to wgmaster/vba/form/Form_MAbwertungen.frm
diff --git a/wgmaster/vba/Form_MAdministration.frm b/wgmaster/vba/form/Form_MAdministration.frm
similarity index 100%
rename from wgmaster/vba/Form_MAdministration.frm
rename to wgmaster/vba/form/Form_MAdministration.frm
diff --git a/wgmaster/vba/Form_MAdministrationCopy.frm b/wgmaster/vba/form/Form_MAdministrationCopy.frm
similarity index 100%
rename from wgmaster/vba/Form_MAdministrationCopy.frm
rename to wgmaster/vba/form/Form_MAdministrationCopy.frm
diff --git a/wgmaster/vba/Form_MAdministrationCopy2.frm b/wgmaster/vba/form/Form_MAdministrationCopy2.frm
similarity index 100%
rename from wgmaster/vba/Form_MAdministrationCopy2.frm
rename to wgmaster/vba/form/Form_MAdministrationCopy2.frm
diff --git a/wgmaster/vba/Form_MAnlieferung.frm b/wgmaster/vba/form/Form_MAnlieferung.frm
similarity index 100%
rename from wgmaster/vba/Form_MAnlieferung.frm
rename to wgmaster/vba/form/Form_MAnlieferung.frm
diff --git a/wgmaster/vba/Form_MAnlieferungenJahresvergleich.frm b/wgmaster/vba/form/Form_MAnlieferungenJahresvergleich.frm
similarity index 100%
rename from wgmaster/vba/Form_MAnlieferungenJahresvergleich.frm
rename to wgmaster/vba/form/Form_MAnlieferungenJahresvergleich.frm
diff --git a/wgmaster/vba/Form_MAuswertung.frm b/wgmaster/vba/form/Form_MAuswertung.frm
similarity index 100%
rename from wgmaster/vba/Form_MAuswertung.frm
rename to wgmaster/vba/form/Form_MAuswertung.frm
diff --git a/wgmaster/vba/Form_MAuswertungMitglieder.frm b/wgmaster/vba/form/Form_MAuswertungMitglieder.frm
similarity index 100%
rename from wgmaster/vba/Form_MAuswertungMitglieder.frm
rename to wgmaster/vba/form/Form_MAuswertungMitglieder.frm
diff --git a/wgmaster/vba/Form_MAuszahlung.frm b/wgmaster/vba/form/Form_MAuszahlung.frm
similarity index 100%
rename from wgmaster/vba/Form_MAuszahlung.frm
rename to wgmaster/vba/form/Form_MAuszahlung.frm
diff --git a/wgmaster/vba/Form_MAuszahlungAuswahl.frm b/wgmaster/vba/form/Form_MAuszahlungAuswahl.frm
similarity index 100%
rename from wgmaster/vba/Form_MAuszahlungAuswahl.frm
rename to wgmaster/vba/form/Form_MAuszahlungAuswahl.frm
diff --git a/wgmaster/vba/Form_MChargenAuswahl.frm b/wgmaster/vba/form/Form_MChargenAuswahl.frm
similarity index 100%
rename from wgmaster/vba/Form_MChargenAuswahl.frm
rename to wgmaster/vba/form/Form_MChargenAuswahl.frm
diff --git a/wgmaster/vba/Form_MChargenListe.frm b/wgmaster/vba/form/Form_MChargenListe.frm
similarity index 100%
rename from wgmaster/vba/Form_MChargenListe.frm
rename to wgmaster/vba/form/Form_MChargenListe.frm
diff --git a/wgmaster/vba/Form_MExport.frm b/wgmaster/vba/form/Form_MExport.frm
similarity index 100%
rename from wgmaster/vba/Form_MExport.frm
rename to wgmaster/vba/form/Form_MExport.frm
diff --git a/wgmaster/vba/Form_MExportAuszahlung.frm b/wgmaster/vba/form/Form_MExportAuszahlung.frm
similarity index 100%
rename from wgmaster/vba/Form_MExportAuszahlung.frm
rename to wgmaster/vba/form/Form_MExportAuszahlung.frm
diff --git a/wgmaster/vba/Form_MExportBKIListe.frm b/wgmaster/vba/form/Form_MExportBKIListe.frm
similarity index 100%
rename from wgmaster/vba/Form_MExportBKIListe.frm
rename to wgmaster/vba/form/Form_MExportBKIListe.frm
diff --git a/wgmaster/vba/Form_MExportMitglieder.frm b/wgmaster/vba/form/Form_MExportMitglieder.frm
similarity index 100%
rename from wgmaster/vba/Form_MExportMitglieder.frm
rename to wgmaster/vba/form/Form_MExportMitglieder.frm
diff --git a/wgmaster/vba/Form_MHauptmenü.frm b/wgmaster/vba/form/Form_MHauptmenü.frm
similarity index 100%
rename from wgmaster/vba/Form_MHauptmenü.frm
rename to wgmaster/vba/form/Form_MHauptmenü.frm
diff --git a/wgmaster/vba/Form_MImport.frm b/wgmaster/vba/form/Form_MImport.frm
similarity index 100%
rename from wgmaster/vba/Form_MImport.frm
rename to wgmaster/vba/form/Form_MImport.frm
diff --git a/wgmaster/vba/Form_MLeseauswertung.frm b/wgmaster/vba/form/Form_MLeseauswertung.frm
similarity index 100%
rename from wgmaster/vba/Form_MLeseauswertung.frm
rename to wgmaster/vba/form/Form_MLeseauswertung.frm
diff --git a/wgmaster/vba/Form_MLieferscheinBereinigung.frm b/wgmaster/vba/form/Form_MLieferscheinBereinigung.frm
similarity index 100%
rename from wgmaster/vba/Form_MLieferscheinBereinigung.frm
rename to wgmaster/vba/form/Form_MLieferscheinBereinigung.frm
diff --git a/wgmaster/vba/Form_MLieferungAuswahl.frm b/wgmaster/vba/form/Form_MLieferungAuswahl.frm
similarity index 100%
rename from wgmaster/vba/Form_MLieferungAuswahl.frm
rename to wgmaster/vba/form/Form_MLieferungAuswahl.frm
diff --git a/wgmaster/vba/Form_MLieferungSuchen.frm b/wgmaster/vba/form/Form_MLieferungSuchen.frm
similarity index 100%
rename from wgmaster/vba/Form_MLieferungSuchen.frm
rename to wgmaster/vba/form/Form_MLieferungSuchen.frm
diff --git a/wgmaster/vba/Form_MMandantenauswahl.frm b/wgmaster/vba/form/Form_MMandantenauswahl.frm
similarity index 100%
rename from wgmaster/vba/Form_MMandantenauswahl.frm
rename to wgmaster/vba/form/Form_MMandantenauswahl.frm
diff --git a/wgmaster/vba/Form_MMitgliederKonsistenz.frm b/wgmaster/vba/form/Form_MMitgliederKonsistenz.frm
similarity index 100%
rename from wgmaster/vba/Form_MMitgliederKonsistenz.frm
rename to wgmaster/vba/form/Form_MMitgliederKonsistenz.frm
diff --git a/wgmaster/vba/Form_MMitgliederliste.frm b/wgmaster/vba/form/Form_MMitgliederliste.frm
similarity index 100%
rename from wgmaster/vba/Form_MMitgliederliste.frm
rename to wgmaster/vba/form/Form_MMitgliederliste.frm
diff --git a/wgmaster/vba/Form_MRundschreiben.frm b/wgmaster/vba/form/Form_MRundschreiben.frm
similarity index 100%
rename from wgmaster/vba/Form_MRundschreiben.frm
rename to wgmaster/vba/form/Form_MRundschreiben.frm
diff --git a/wgmaster/vba/Form_MRundschreibenEMail.frm b/wgmaster/vba/form/Form_MRundschreibenEMail.frm
similarity index 100%
rename from wgmaster/vba/Form_MRundschreibenEMail.frm
rename to wgmaster/vba/form/Form_MRundschreibenEMail.frm
diff --git a/wgmaster/vba/Form_MStammblatt.frm b/wgmaster/vba/form/Form_MStammblatt.frm
similarity index 100%
rename from wgmaster/vba/Form_MStammblatt.frm
rename to wgmaster/vba/form/Form_MStammblatt.frm
diff --git a/wgmaster/vba/Form_MStammdaten.frm b/wgmaster/vba/form/Form_MStammdaten.frm
similarity index 100%
rename from wgmaster/vba/Form_MStammdaten.frm
rename to wgmaster/vba/form/Form_MStammdaten.frm
diff --git a/wgmaster/vba/Form_MUnterlieferungen.frm b/wgmaster/vba/form/Form_MUnterlieferungen.frm
similarity index 100%
rename from wgmaster/vba/Form_MUnterlieferungen.frm
rename to wgmaster/vba/form/Form_MUnterlieferungen.frm