diff --git a/ListAndForm DataSource for 2sxc EAV/ListAndForm DataSource for 2sxc EAV/Dnn.FormAndList DataSource for 2sxc EAV.csproj b/ListAndForm DataSource for 2sxc EAV/ListAndForm DataSource for 2sxc EAV/Dnn.FormAndList DataSource for 2sxc EAV.csproj
deleted file mode 100644
index 46f8d34..0000000
--- a/ListAndForm DataSource for 2sxc EAV/ListAndForm DataSource for 2sxc EAV/Dnn.FormAndList DataSource for 2sxc EAV.csproj	
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{F8D2FB76-EA96-454F-AC0A-A809F07B64BD}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ToSic.Dnn.DataSources</RootNamespace>
-    <AssemblyName>ToSic.Dnn.DataSources.ListAndForm</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="dotnetnuke.modules.userdefinedtable">
-      <HintPath>..\..\Binaries of DNN, EAV, 2sxc\dotnetnuke.modules.userdefinedtable.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-    <Reference Include="ToSic.Eav.Core, Version=4.5.0.28109, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\2SexyContent\Web\bin\ToSic.Eav.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="ToSic.Eav.DataSources, Version=4.5.0.28110, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\2SexyContent\Web\bin\ToSic.Eav.DataSources.dll</HintPath>
-    </Reference>
-    <Reference Include="ToSic.Eav.Tokens, Version=4.5.0.28110, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\2SexyContent\Web\bin\ToSic.Eav.Tokens.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="DnnFormAndList.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
diff --git a/ListAndForm DataSource for 2sxc EAV/ListAndForm DataSource for 2sxc EAV/Properties/AssemblyInfo.cs b/ListAndForm DataSource for 2sxc EAV/ListAndForm DataSource for 2sxc EAV/Properties/AssemblyInfo.cs
deleted file mode 100644
index 6e8e1e7..0000000
--- a/ListAndForm DataSource for 2sxc EAV/ListAndForm DataSource for 2sxc EAV/Properties/AssemblyInfo.cs	
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("ListAndForm DataSource for 2sxc EAV")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ListAndForm DataSource for 2sxc EAV")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("f8d2fb76-ea96-454f-ac0a-a809f07b64bd")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/ListAndForm DataSource for 2sxc EAV/ToSic.Dnn.DataSources.FnL/DnnFormAndList.cs b/ListAndForm DataSource for 2sxc EAV/ToSic.Dnn.DataSources.FnL/DnnFormAndList.cs
deleted file mode 100644
index f79e7e5..0000000
--- a/ListAndForm DataSource for 2sxc EAV/ToSic.Dnn.DataSources.FnL/DnnFormAndList.cs	
+++ /dev/null
@@ -1,101 +0,0 @@
-using System.Collections.Generic;
-using DotNetNuke.Modules.UserDefinedTable;
-using ToSic.Eav;
-using ToSic.Eav.DataSources;
-using ToSic.Eav.DataSources.VisualQuery;
-
-namespace ToSic.Dnn.DataSources
-{
-    /// <inheritdoc />
-    /// <summary>
-    /// Delivers UDT-data (now known as Form and List) to the templating engine
-    /// </summary>
-    [VisualQuery(GlobalName = "ToSic.Dnn.DataSources.DnnFormAndList",
-        PreviousNames = new []{
-            "Environment.Dnn7.DataSources.DnnFormAndList, ToSic.SexyContent",
-            "ToSic.SexyContent.DataSources.DnnFormAndList, ToSic.SexyContent" },
-        Type = DataSourceType.Source, 
-        DynamicOut = true,
-        ExpectsDataOfType = "|Config ToSic.SexyContent.DataSources.DnnFormAndList")] // todo: create new/own
-
-    public sealed class DnnFormAndList : ExternalDataDataSource
-    {
-
-        public override string LogId => "Dnn.Ds-FnL";                   // this text is added to all internal logs, so it's easier to debug
-
-        private const string ModuleIdConfigKey = "ModuleId";            // key in the configuration list for module Id
-        private const string TitleFieldConfigKey = "TitleField";        // key in the configuration list for the title filed
-        private const string ContentTypeConfigKey = "ContentType";      // key in the configuration list for the content-type name
-
-        /// <summary>
-        /// Get the FnL ModuleID (which contains the data) from the configuration
-        /// </summary>
-        private int ModuleId => int.Parse(Configuration[ModuleIdConfigKey]);
-
-        /// <summary>
-        /// Name of the Title Attribute of the Source DataTable from the configuration
-        /// </summary>
-        private string TitleField => Configuration[TitleFieldConfigKey];
-
-        /// <summary>
-        /// Name of the ContentType Attribute from the configuration
-        /// </summary>
-        private string ContentType => Configuration[ContentTypeConfigKey];
-
-
-        /// <summary>
-        /// Initializes this data source
-        /// </summary>
-        public DnnFormAndList()
-        {
-            // Specify what out-streams this data-source provides. Usually just one, called "Default"
-            Out.Add(Constants.DefaultStreamName, new DataStream(this, Constants.DefaultStreamName, GetList));
-
-            // Register the configurations we want as tokens, so that the values will be injected later on
-            Configuration.Add(ModuleIdConfigKey, "[Settings:ModuleId||0]");
-            Configuration.Add(TitleFieldConfigKey, "[Settings:TitleFieldName]");
-            Configuration.Add(ContentTypeConfigKey, "[Settings:ContentTypeName||FnL]");
-        }
-
-        /// <summary>
-        /// Internal helper that returns the entities - actually just retrieving them from the attached Data-Source
-        /// </summary>
-        /// <returns></returns>
-        private IEnumerable<Eav.Interfaces.IEntity> GetList() => LoadFnL().List;
-
-
-        private DataTableDataSource LoadFnL()
-        {
-            // check if already loaded, if yes, return that
-            if (_dtDs != null) return _dtDs;
-
-            // this parses the config-tokens, resulting in the values we will use in the code below
-            EnsureConfigurationIsLoaded();
-
-            // Preferred way in Form and List - use GetDataSet of ModuleId
-            var udt = new UserDefinedTableController();
-            var ds = udt.GetDataSet(ModuleId);
-
-            // now build a DataTableDataSource to pass on
-            _dtDs = DataSource.GetDataSource<DataTableDataSource>(valueCollectionProvider: ConfigurationProvider, parentLog: Log);
-            _dtDs.Source = ds.Tables["Data"];           // the data-table of FnL/UDT
-            _dtDs.EntityIdField = "UserDefinedRowId";   // default column created by FnL/UDT
-            _dtDs.ContentType = ContentType;            // a type name what these items are called afterwards
-
-            // clean up column names if possible, remove spaces in the column-names as this would cause trouble in Razor templates
-            for (var i = 0; i < _dtDs.Source.Columns.Count; i++)
-                _dtDs.Source.Columns[i].ColumnName = _dtDs.Source.Columns[i].ColumnName
-                    .Replace(" ", "");
-
-            // Set the title-field - either the configured one, or if missing, just the first column we find
-            _dtDs.TitleField = string.IsNullOrWhiteSpace(TitleField) 
-                ? _dtDs.Source.Columns[1].ColumnName 
-                : TitleField;
-            return _dtDs;
-        }
-        private DataTableDataSource _dtDs;
-
-
-
-    }
-}
diff --git a/ListAndForm DataSource for 2sxc EAV/ToSic.Dnn.DataSources.FnL/ToSic.Dnn.DataSources.FnL.dnn b/ListAndForm DataSource for 2sxc EAV/ToSic.Dnn.DataSources.FnL/ToSic.Dnn.DataSources.FnL.dnn
deleted file mode 100644
index 14c89c6..0000000
--- a/ListAndForm DataSource for 2sxc EAV/ToSic.Dnn.DataSources.FnL/ToSic.Dnn.DataSources.FnL.dnn	
+++ /dev/null
@@ -1,117 +0,0 @@
-<dotnetnuke type="Package" version="5.0">
-  <packages>
-    <package name="ToSic.Dnn.DataSources.FnL" type="Module" version="01.00.00">
-      <friendlyName>ToSic.Dnn.DataSources.FnL</friendlyName>
-      <description>2sic.com ToSic.Dnn.DataSources.FnL module</description>
-      <iconFile>~/Images/icon_extensions_32px.png</iconFile>
-      <owner>
-        <name>2sic.com</name>
-        <organization>2sic.com</organization>
-        <url>https://2sxc.org/</url>
-        <email>info@2sxc.org</email>
-      </owner>
-      <license src="License.txt"></license>
-      <releaseNotes src="ReleaseNotes.txt"></releaseNotes>
-      <azureCompatible>true</azureCompatible>
-      <dependencies>
-        <dependency type="CoreVersion">07.04.00</dependency>
-      </dependencies>
-      
-      <components>
-        <!--<component type="Script">
-          <scripts>
-            <basePath>DesktopModules\ToSic.Dnn.DataSources.FnL</basePath>
-            <script type="Install">
-              <path>Providers\DataProviders\SqlDataProvider</path>
-              <name>01.00.00.SqlDataProvider</name>
-              <version>01.00.00</version>
-            </script>
-            <script type="UnInstall">
-              <path>Providers\DataProviders\SqlDataProvider</path>
-              <name>Uninstall.SqlDataProvider</name>
-              <version>01.00.00</version>
-            </script>
-          </scripts>
-        </component>
-
-        <component type="ResourceFile">
-          <resourceFiles>
-            <basePath>DesktopModules/ToSic.Dnn.DataSources.FnL</basePath>
-            <resourceFile>
-              <name>Resources.zip</name>
-            </resourceFile>
-          </resourceFiles>
-        </component>
-
-        <component type="Module">
-          <desktopModule>
-            <moduleName>ToSic.Dnn.DataSources.FnL</moduleName>
-            <foldername>ToSic.Dnn.DataSources.FnL</foldername>
-            <businessControllerClass>ToSic.Dnn.DataSourcesToSic.Dnn.DataSources.FnL.Components.FeatureController, ToSic.Dnn.DataSources.FnL</businessControllerClass>
-            <supportedFeatures>
-              <supportedFeature>IPortable</supportedFeature>
-              <supportedFeature>ISearchable</supportedFeature>
-              <supportedFeature>IUpgradeable</supportedFeature>
-            </supportedFeatures>
-            <moduleDefinitions>
-              <moduleDefinition>
-                <friendlyName>ToSic.Dnn.DataSources.FnL</friendlyName>
-                <defaultCacheTime>0</defaultCacheTime>
-                <moduleControls>
-                  <moduleControl>
-                    <controlKey />
-                    <controlSrc>DesktopModules/ToSic.Dnn.DataSources.FnL/View.ascx</controlSrc>
-                    <supportsPartialRendering>False</supportsPartialRendering>
-                    <controlTitle />
-                    <controlType>View</controlType>
-                    <iconFile />
-                    <helpUrl />
-                    <viewOrder>0</viewOrder>
-                  </moduleControl>
-                  <moduleControl>
-                    <controlKey>Edit</controlKey>
-                    <controlSrc>DesktopModules/ToSic.Dnn.DataSources.FnL/Edit.ascx</controlSrc>
-                    <supportsPartialRendering>False</supportsPartialRendering>
-                    <controlTitle>Edit Content</controlTitle>
-                    <controlType>Edit</controlType>
-                    <iconFile />
-                    <helpUrl />
-                    <viewOrder>0</viewOrder>
-                    <supportsPopUps>True</supportsPopUps>
-                  </moduleControl>
-                  <moduleControl>
-                    <controlKey>Settings</controlKey>
-                    <controlSrc>DesktopModules/ToSic.Dnn.DataSources.FnL/Settings.ascx</controlSrc>
-                    <supportsPartialRendering>False</supportsPartialRendering>
-                    <controlTitle>ToSic.Dnn.DataSources.FnL Settings</controlTitle>
-                    <controlType>Edit</controlType>
-                    <iconFile />
-                    <helpUrl />
-                    <viewOrder>0</viewOrder>
-                  </moduleControl>
-                </moduleControls>
-              </moduleDefinition>
-            </moduleDefinitions>
-          </desktopModule>
-          <eventMessage>
-            <processorType>DotNetNuke.Entities.Modules.EventMessageProcessor, DotNetNuke</processorType>
-            <processorCommand>UpgradeModule</processorCommand>
-            <attributes>
-              <businessControllerClass>ToSic.Dnn.DataSourcesToSic.Dnn.DataSources.FnL.Components.FeatureController, ToSic.Dnn.DataSources.FnL</businessControllerClass>
-              <desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
-              <upgradeVersionsList>01.00.00</upgradeVersionsList>
-            </attributes>
-          </eventMessage>
-        </component>-->
-        <component type="Assembly">
-          <assemblies>
-            <assembly>
-              <name>ToSic.Dnn.DataSources.FnL.dll</name>
-              <path>bin</path>
-            </assembly>
-          </assemblies>
-        </component>
-      </components>
-    </package>
-  </packages>
-</dotnetnuke>
\ No newline at end of file
diff --git a/ListAndForm DataSource for 2sxc EAV/ToSic.Dnn.DataSources.FnL/module.css b/ListAndForm DataSource for 2sxc EAV/ToSic.Dnn.DataSources.FnL/module.css
deleted file mode 100644
index e69de29..0000000
diff --git a/ListAndForm DataSource for 2sxc EAV/ToSic.Dnn.DataSources.FnL/App_LocalResources/Edit.ascx.resx b/ToSic.Dnn.DataSources.FnL/App_LocalResources/Edit.ascx.resx
similarity index 100%
rename from ListAndForm DataSource for 2sxc EAV/ToSic.Dnn.DataSources.FnL/App_LocalResources/Edit.ascx.resx
rename to ToSic.Dnn.DataSources.FnL/App_LocalResources/Edit.ascx.resx
diff --git a/ListAndForm DataSource for 2sxc EAV/ToSic.Dnn.DataSources.FnL/App_LocalResources/Settings.ascx.resx b/ToSic.Dnn.DataSources.FnL/App_LocalResources/Settings.ascx.resx
similarity index 100%
rename from ListAndForm DataSource for 2sxc EAV/ToSic.Dnn.DataSources.FnL/App_LocalResources/Settings.ascx.resx
rename to ToSic.Dnn.DataSources.FnL/App_LocalResources/Settings.ascx.resx
diff --git a/ListAndForm DataSource for 2sxc EAV/ToSic.Dnn.DataSources.FnL/App_LocalResources/View.ascx.resx b/ToSic.Dnn.DataSources.FnL/App_LocalResources/View.ascx.resx
similarity index 100%
rename from ListAndForm DataSource for 2sxc EAV/ToSic.Dnn.DataSources.FnL/App_LocalResources/View.ascx.resx
rename to ToSic.Dnn.DataSources.FnL/App_LocalResources/View.ascx.resx
diff --git a/ListAndForm DataSource for 2sxc EAV/ToSic.Dnn.DataSources.FnL/BuildScripts/MSBuild.Community.Tasks.Targets b/ToSic.Dnn.DataSources.FnL/BuildScripts/MSBuild.Community.Tasks.Targets
similarity index 100%
rename from ListAndForm DataSource for 2sxc EAV/ToSic.Dnn.DataSources.FnL/BuildScripts/MSBuild.Community.Tasks.Targets
rename to ToSic.Dnn.DataSources.FnL/BuildScripts/MSBuild.Community.Tasks.Targets
diff --git a/ListAndForm DataSource for 2sxc EAV/ToSic.Dnn.DataSources.FnL/BuildScripts/ModulePackage.targets b/ToSic.Dnn.DataSources.FnL/BuildScripts/ModulePackage.targets
similarity index 100%
rename from ListAndForm DataSource for 2sxc EAV/ToSic.Dnn.DataSources.FnL/BuildScripts/ModulePackage.targets
rename to ToSic.Dnn.DataSources.FnL/BuildScripts/ModulePackage.targets
diff --git a/ListAndForm DataSource for 2sxc EAV/ListAndForm DataSource for 2sxc EAV/DnnFormAndList.cs b/ToSic.Dnn.DataSources.FnL/DnnFormAndList.cs
similarity index 100%
rename from ListAndForm DataSource for 2sxc EAV/ListAndForm DataSource for 2sxc EAV/DnnFormAndList.cs
rename to ToSic.Dnn.DataSources.FnL/DnnFormAndList.cs
diff --git a/ListAndForm DataSource for 2sxc EAV/ToSic.Dnn.DataSources.FnL/License.txt b/ToSic.Dnn.DataSources.FnL/License.txt
similarity index 94%
rename from ListAndForm DataSource for 2sxc EAV/ToSic.Dnn.DataSources.FnL/License.txt
rename to ToSic.Dnn.DataSources.FnL/License.txt
index 8407aed..365d2d1 100644
--- a/ListAndForm DataSource for 2sxc EAV/ToSic.Dnn.DataSources.FnL/License.txt	
+++ b/ToSic.Dnn.DataSources.FnL/License.txt
@@ -1,7 +1,7 @@
 <div class="License">
 	<h3>License</h3>
 	<p class="Owner">
-		2sic.com  <a href=https://2sxc.org/>https://2sxc.org/</a></br>
+		2sic.com  <a href="https://2sxc.org/">https://2sxc.org/</a></br>
 		Copyright (c) 2017</br>	
 		by 2sic.com</br>
 	</p>
diff --git a/ListAndForm DataSource for 2sxc EAV/ToSic.Dnn.DataSources.FnL/Properties/AssemblyInfo.cs b/ToSic.Dnn.DataSources.FnL/Properties/AssemblyInfo.cs
similarity index 100%
rename from ListAndForm DataSource for 2sxc EAV/ToSic.Dnn.DataSources.FnL/Properties/AssemblyInfo.cs
rename to ToSic.Dnn.DataSources.FnL/Properties/AssemblyInfo.cs
diff --git a/ListAndForm DataSource for 2sxc EAV/ToSic.Dnn.DataSources.FnL/ReleaseNotes.txt b/ToSic.Dnn.DataSources.FnL/ReleaseNotes.txt
similarity index 100%
rename from ListAndForm DataSource for 2sxc EAV/ToSic.Dnn.DataSources.FnL/ReleaseNotes.txt
rename to ToSic.Dnn.DataSources.FnL/ReleaseNotes.txt
diff --git a/ListAndForm DataSource for 2sxc EAV/ToSic.Dnn.DataSources.FnL/ToSic.Dnn.DataSources.FnL.csproj b/ToSic.Dnn.DataSources.FnL/ToSic.Dnn.DataSources.FnL.csproj
similarity index 96%
rename from ListAndForm DataSource for 2sxc EAV/ToSic.Dnn.DataSources.FnL/ToSic.Dnn.DataSources.FnL.csproj
rename to ToSic.Dnn.DataSources.FnL/ToSic.Dnn.DataSources.FnL.csproj
index 5cae32f..547da77 100644
--- a/ListAndForm DataSource for 2sxc EAV/ToSic.Dnn.DataSources.FnL/ToSic.Dnn.DataSources.FnL.csproj	
+++ b/ToSic.Dnn.DataSources.FnL/ToSic.Dnn.DataSources.FnL.csproj
@@ -48,10 +48,10 @@
       <HintPath>..\..\..\2SexyContent\Web\bin\DotNetNuke.dll</HintPath>
     </Reference>
     <Reference Include="dotnetnuke.modules.userdefinedtable">
-      <HintPath>..\..\Binaries of DNN, EAV, 2sxc\dotnetnuke.modules.userdefinedtable.dll</HintPath>
+      <HintPath>..\bin dependencies\dotnetnuke.modules.userdefinedtable.dll</HintPath>
     </Reference>
     <Reference Include="DotNetNuke.Web">
-      <HintPath>..\..\..\2SexyContent\Web\bin\DotNetNuke.Web.dll</HintPath>
+      <HintPath>..\..\2SexyContent\Web\bin\DotNetNuke.Web.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System" />
@@ -83,7 +83,6 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="License.txt" />
-    <Content Include="module.css" />
     <Content Include="ReleaseNotes.txt" />
   </ItemGroup>
   <ItemGroup>
diff --git a/ToSic.Dnn.DataSources.FnL/ToSic.Dnn.DataSources.FnL.dnn b/ToSic.Dnn.DataSources.FnL/ToSic.Dnn.DataSources.FnL.dnn
new file mode 100644
index 0000000..3823bca
--- /dev/null
+++ b/ToSic.Dnn.DataSources.FnL/ToSic.Dnn.DataSources.FnL.dnn
@@ -0,0 +1,32 @@
+<dotnetnuke type="Package" version="5.0">
+  <packages>
+    <package name="ToSic.Dnn.DataSources.FnL" type="Module" version="01.00.00">
+      <friendlyName>ToSic.Dnn.DataSources.FnL</friendlyName>
+      <description>2sic.com ToSic.Dnn.DataSources.FnL module</description>
+      <iconFile>~/Images/icon_extensions_32px.png</iconFile>
+      <owner>
+        <name>2sic.com</name>
+        <organization>2sic.com</organization>
+        <url>https://2sxc.org/</url>
+        <email>info@2sxc.org</email>
+      </owner>
+      <license src="License.txt"></license>
+      <releaseNotes src="ReleaseNotes.txt"></releaseNotes>
+      <azureCompatible>true</azureCompatible>
+      <dependencies>
+        <dependency type="CoreVersion">07.04.00</dependency>
+      </dependencies>
+      
+      <components>
+        <component type="Assembly">
+          <assemblies>
+            <assembly>
+              <name>ToSic.Dnn.DataSources.FnL.dll</name>
+              <path>bin</path>
+            </assembly>
+          </assemblies>
+        </component>
+      </components>
+    </package>
+  </packages>
+</dotnetnuke>
\ No newline at end of file
diff --git a/ListAndForm DataSource for 2sxc EAV/ToSic.Dnn.DataSources.FnL/install/ToSic.Dnn.DataSources.FnL_01.00.00_Install.zip b/ToSic.Dnn.DataSources.FnL/install/ToSic.Dnn.DataSources.FnL_01.00.00_Install.zip
similarity index 100%
rename from ListAndForm DataSource for 2sxc EAV/ToSic.Dnn.DataSources.FnL/install/ToSic.Dnn.DataSources.FnL_01.00.00_Install.zip
rename to ToSic.Dnn.DataSources.FnL/install/ToSic.Dnn.DataSources.FnL_01.00.00_Install.zip
diff --git a/ListAndForm DataSource for 2sxc EAV/ToSic.Dnn.DataSources.FnL/install/ToSic.Dnn.DataSources.FnL_01.00.00_Source.zip b/ToSic.Dnn.DataSources.FnL/install/ToSic.Dnn.DataSources.FnL_01.00.00_Source.zip
similarity index 100%
rename from ListAndForm DataSource for 2sxc EAV/ToSic.Dnn.DataSources.FnL/install/ToSic.Dnn.DataSources.FnL_01.00.00_Source.zip
rename to ToSic.Dnn.DataSources.FnL/install/ToSic.Dnn.DataSources.FnL_01.00.00_Source.zip
diff --git a/ListAndForm DataSource for 2sxc EAV/ToSic.Dnn.DataSources.FnL/packages.config b/ToSic.Dnn.DataSources.FnL/packages.config
similarity index 100%
rename from ListAndForm DataSource for 2sxc EAV/ToSic.Dnn.DataSources.FnL/packages.config
rename to ToSic.Dnn.DataSources.FnL/packages.config
diff --git a/ListAndForm DataSource for 2sxc EAV/DNN.FormAndList DataSource for 2sxc EAV.sln b/ToSic.Dnn.DataSources.FormAndList for 2sxc EAV.sln
similarity index 67%
rename from ListAndForm DataSource for 2sxc EAV/DNN.FormAndList DataSource for 2sxc EAV.sln
rename to ToSic.Dnn.DataSources.FormAndList for 2sxc EAV.sln
index daa08eb..7896548 100644
--- a/ListAndForm DataSource for 2sxc EAV/DNN.FormAndList DataSource for 2sxc EAV.sln	
+++ b/ToSic.Dnn.DataSources.FormAndList for 2sxc EAV.sln	
@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27004.2009
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dnn.FormAndList DataSource for 2sxc EAV", "ListAndForm DataSource for 2sxc EAV\Dnn.FormAndList DataSource for 2sxc EAV.csproj", "{F8D2FB76-EA96-454F-AC0A-A809F07B64BD}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ToSic.Dnn.DataSources.FnL", "ToSic.Dnn.DataSources.FnL\ToSic.Dnn.DataSources.FnL.csproj", "{7D61A32C-0F21-453F-A981-BD8E5A3A5304}"
 EndProject
 Global
@@ -13,10 +11,6 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F8D2FB76-EA96-454F-AC0A-A809F07B64BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F8D2FB76-EA96-454F-AC0A-A809F07B64BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F8D2FB76-EA96-454F-AC0A-A809F07B64BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F8D2FB76-EA96-454F-AC0A-A809F07B64BD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7D61A32C-0F21-453F-A981-BD8E5A3A5304}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7D61A32C-0F21-453F-A981-BD8E5A3A5304}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7D61A32C-0F21-453F-A981-BD8E5A3A5304}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/Binaries of DNN, EAV, 2sxc/dotnetnuke.modules.userdefinedtable.dll b/bin dependencies/dotnetnuke.modules.userdefinedtable.dll
similarity index 100%
rename from Binaries of DNN, EAV, 2sxc/dotnetnuke.modules.userdefinedtable.dll
rename to bin dependencies/dotnetnuke.modules.userdefinedtable.dll