diff --git a/benchmark/data/Benchmark.pi b/benchmark/data/Benchmark.pi
index 496355d..fa96d4b 100644
--- a/benchmark/data/Benchmark.pi
+++ b/benchmark/data/Benchmark.pi
@@ -1,207 +1,214 @@
 page Benchmark {
-  #SetContext(key: "settings", value: {
-    logo: "/public/images/logo.svg",
-    contact: {
-      title: "aute veniam",
-      address: "Lorem Ipsumstreet 22",
-      phone: "01234567890",
-      email: "lorem@ipsum.com",
+  #SetContext(
+    key: "settings",
+    value: {
+      logo: "/public/images/logo.svg",
+      contact: {
+        title: "aute veniam",
+        address: "Lorem Ipsumstreet 22",
+        phone: "01234567890",
+        email: "lorem@ipsum.com",
+      },
+      footerLinks: [
+        {
+          url: "#0",
+          title: "sunt minim",
+        },
+        {
+          url: "#0",
+          title: "culpa incididunt",
+        },
+        {
+          url: "#0",
+          title: "deserunt",
+        },
+        {
+          url: "#0",
+          title: "tempor veniam",
+        },
+      ],
     },
-    footerLinks: [
+  );
+
+  #SetContext(
+    key: "projects",
+    value: [
       {
-        url: "#0",
-        title: "sunt minim",
+        jobs: ["", "", "", ""],
+        title: "",
+        intro: "",
+        url: "",
+        image: "",
       },
       {
-        url: "#0",
-        title: "culpa incididunt",
+        jobs: ["", "", "", ""],
+        title: "",
+        intro: "",
+        url: "",
+        image: "",
       },
       {
-        url: "#0",
-        title: "deserunt",
+        jobs: ["", "", "", ""],
+        title: "",
+        intro: "",
+        url: "",
+        image: "",
       },
       {
-        url: "#0",
-        title: "tempor veniam",
-      }
-    ]
-  });
-
-  #SetContext(key: "projects", value: [
-    {
-      jobs: ["", "", "", ""],
-      title: "",
-      intro: "",
-      url: "",
-      image: "",
-    },
-    {
-      jobs: ["", "", "", ""],
-      title: "",
-      intro: "",
-      url: "",
-      image: "",
-    },
-    {
-      jobs: ["", "", "", ""],
-      title: "",
-      intro: "",
-      url: "",
-      image: "",
-    },
-    {
-      jobs: ["", "", "", ""],
-      title: "",
-      intro: "",
-      url: "",
-      image: "",
-    },
-    {
-      jobs: ["", "", "", ""],
-      title: "",
-      intro: "",
-      url: "",
-      image: "",
-    },
-    {
-      jobs: ["", "", "", ""],
-      title: "",
-      intro: "",
-      url: "",
-      image: "",
-    },
-    {
-      jobs: ["", "", "", ""],
-      title: "",
-      intro: "",
-      url: "",
-      image: "",
-    },
-    {
-      jobs: ["", "", "", ""],
-      title: "",
-      intro: "",
-      url: "",
-      image: "",
-    },
-    {
-      jobs: ["", "", "", ""],
-      title: "",
-      intro: "",
-      url: "",
-      image: "",
-    },
-    {
-      jobs: ["", "", "", ""],
-      title: "",
-      intro: "",
-      url: "",
-      image: "",
-    },
-    {
-      jobs: ["", "", "", ""],
-      title: "",
-      intro: "",
-      url: "",
-      image: "",
-    },
-  ]);
-
-  <Home
-    title="Lorem"
-  >
-    <Masthead 
-      video="/public/videos/header.mp4"
-      title="Laboris dolore ullamco" 
-      subtitles={[
-        "dolore",
-        "ut nisi",
-        "minim esse",
-        "adipisicing",
-      ]}
-    />
-    <SectionStart />
-    <ProjectSlider />
-    <SectionStart />
-    <ProjectTeaserList />
-    <SectionStart />
-    <Gallery title="" items={[
+        jobs: ["", "", "", ""],
+        title: "",
+        intro: "",
+        url: "",
+        image: "",
+      },
       {
-        type: "image",
-        url: "/public/images/teaser/Adidas.avif",
+        jobs: ["", "", "", ""],
+        title: "",
+        intro: "",
+        url: "",
+        image: "",
       },
       {
-        type: "image",
-        url: "/public/images/teaser/Aston_Martin.avif",
-        },
+        jobs: ["", "", "", ""],
+        title: "",
+        intro: "",
+        url: "",
+        image: "",
+      },
       {
-        type: "image",
-        url: "/public/images/teaser/Audi.avif",
-        },
+        jobs: ["", "", "", ""],
+        title: "",
+        intro: "",
+        url: "",
+        image: "",
+      },
       {
-        type: "video",
-        position: "top right",
-        url: "/projects/02_Dollhouse/02_VFX-BREAKDOWN/Dollhouse-Frame-rebuild.mp4",
-        },
+        jobs: ["", "", "", ""],
+        title: "",
+        intro: "",
+        url: "",
+        image: "",
+      },
       {
-        type: "video",
-        url: "/projects/R+V/02_VFX-BREAKDOWN/r+v.mp4",
-        },
+        jobs: ["", "", "", ""],
+        title: "",
+        intro: "",
+        url: "",
+        image: "",
+      },
       {
-        type: "image",
-        url: "/public/images/teaser/Tipico.avif",
-       },
-      { type: "image",
-        url: "/public/images/teaser/VW.avif",
-       },
-      { type: "image",
-        url: "/public/images/teaser/Zalando.avif",
-       },
-      { type: "image",
-        url: "/public/images/teaser/Edeka.avif",
-       },
-      { type: "image",
-        url: "/public/images/teaser/Glamira.avif",
-      }
-    ]} />
-
-    <SectionStart title="About me" />
+        jobs: ["", "", "", ""],
+        title: "",
+        intro: "",
+        url: "",
+        image: "",
+      },
+      {
+        jobs: ["", "", "", ""],
+        title: "",
+        intro: "",
+        url: "",
+        image: "",
+      },
+    ],
+  );
 
-    <AboutMe
-      image_alignment="left"
-      image="/public/images/me.avif"
-    >
-      <Copytext
-        text="Non do est ad excepteur cillum ullamco qui duis Lorem tempor et qui eiusmod. Incididunt laborum irure culpa. Esse non ipsum irure non ipsum labore eu commodo aliquip."
-      />
-      <Bulletlist 
-        title="ad non cupidatat"
-        items={[
+  <Home title="Lorem">
+    <Masthead
+      video="/public/videos/header.mp4"
+      title="Laboris dolore ullamco"
+      subtitles={["dolore", "ut nisi", "minim esse", "adipisicing"]}
+    />
+    <SectionStart />
+    <ProjectSlider />
+    <SectionStart />
+    <ProjectTeaserList />
+    <SectionStart />
+    <Gallery
+      title=""
+      items={
+        [
+          {
+            type: "image",
+            url: "/public/images/teaser/Adidas.avif",
+          },
           {
-            title: "",
-            text: "",
+            type: "image",
+            url: "/public/images/teaser/Aston_Martin.avif",
           },
           {
-            title: "",
-            text: "",
+            type: "image",
+            url: "/public/images/teaser/Audi.avif",
           },
           {
-            title: "",
-            text: "",
+            type: "video",
+            position: "top right",
+            url: "/projects/02_Dollhouse/02_VFX-BREAKDOWN/Dollhouse-Frame-rebuild.mp4",
           },
           {
-            title: "",
-            text: "",
+            type: "video",
+            url: "/projects/R+V/02_VFX-BREAKDOWN/r+v.mp4",
           },
           {
-            title: "",
-            text: "",
+            type: "image",
+            url: "/public/images/teaser/Tipico.avif",
           },
           {
-            title: "",
-            text: "",
+            type: "image",
+            url: "/public/images/teaser/VW.avif",
           },
-        ]}
+          {
+            type: "image",
+            url: "/public/images/teaser/Zalando.avif",
+          },
+          {
+            type: "image",
+            url: "/public/images/teaser/Edeka.avif",
+          },
+          {
+            type: "image",
+            url: "/public/images/teaser/Glamira.avif",
+          },
+        ]
+      }
+    />
+
+    <SectionStart title="About me" />
+
+    <AboutMe image_alignment="left" image="/public/images/me.avif">
+      <Copytext
+        text="Non do est ad excepteur cillum ullamco qui duis Lorem tempor et qui eiusmod. Incididunt laborum irure culpa. Esse non ipsum irure non ipsum labore eu commodo aliquip."
+      />
+      <Bulletlist
+        title="ad non cupidatat"
+        items={
+          [
+            {
+              title: "",
+              text: "",
+            },
+            {
+              title: "",
+              text: "",
+            },
+            {
+              title: "",
+              text: "",
+            },
+            {
+              title: "",
+              text: "",
+            },
+            {
+              title: "",
+              text: "",
+            },
+            {
+              title: "",
+              text: "",
+            },
+          ]
+        }
       />
     </AboutMe>
 
@@ -242,9 +249,9 @@ component Footer {
         <div class="Footer-contactWrapper">
           <div class="Footer-contact">
             <h4 class="Footer-contactTitle">
-              {Base.String.nl2br(contact.title)}
+              {Base_String.nl2br(contact.title)}
             </h4>
-            <ButtonPrimary 
+            <ButtonPrimary
               class="Footer-contactCta"
               href={"mailto:$(email)"}
               text="Send me an email"
@@ -254,7 +261,7 @@ component Footer {
 
         <address class="Footer-address">
           <p>
-            {{Base.String.nl2br(contact.address)}}
+            {{ Base_String.nl2br(contact.address) }}
           </p>
           <p>
             <a href="mailto:$(email)">{email}</a> <br />
@@ -263,9 +270,7 @@ component Footer {
         </address>
       </div>
       <div class="Footer-links">
-        {for (link in links) {
-          <a class="Footer-link" href={link.url}>{link.title}</a>
-        }}
+        {for (link in links) { <a class="Footer-link" href={link.url}>{link.title}</a> }}
       </div>
     </div>
   </footer>
@@ -274,8 +279,8 @@ component Footer {
 component Head {
   let title = #String;
 
-  let stylesheets = #CreatePortal :: Base.Array.unique;
-  let scripts = #CreatePortal :: Base.Array.unique;
+  let stylesheets = #CreatePortal :: Base_Array.unique;
+  let scripts = #CreatePortal :: Base_Array.unique;
 
   <head>
     <meta charset="UTF-8" />
@@ -303,64 +308,60 @@ component Masthead {
 
   let video = #String;
   let title = #String;
-  let subtitles = #Array(of: #String :: Base.String.uppercase_ascii);
+  let subtitles = #Array(of: #String :: Base_String.uppercase_ascii);
 
   <ModuleContainer>
     <div class="Masthead">
       <div class="Masthead-videoWrapper">
-        <Video
-          class="Masthead-video"
-          url={video}
-          autoplay={true}
-          loop={true}
-          controls={false}
-        />
+        <Video class="Masthead-video" url={video} autoplay={true} loop={true} controls={false} />
       </div>
       <div class="Masthead-container">
         <div class="Masthead-content">
-          <img
-            class="Masthead-logo"
-            src={settings.logo}
-            alt=""
-          />
+          <img class="Masthead-logo" src={settings.logo} alt="" />
           <h1 class="Masthead-heroTitle">
-            {for index, item in title |> Base.String.split(' ') {
-              if(index == 0) {
-                <>
-                  <span style="position: relative; z-index: -2">{item}</span>
-                  <br />
-                </>
-              } else {
-                item
+            {
+              for (index, item in title
+                |> Base_String.split(' ')) {
+                if (index == 0) {
+                  <>
+                    <span style="position: relative; z-index: -2">{item}</span>
+                    <br />
+                  </>
+                } else {
+                  item
+                }
               }
-            }}
+            }
           </h1>
           <aside class="Masthead-heroSubtitle">
             <ul>
-              {{
-                let base_fade_delay = 200;
-                for index, subtitle in subtitles {
-                  let delay = base_fade_delay * (index + 1) + 400 * index;
-                  <li class="fadeInUp" style="animation-delay: $(delay)ms">{subtitle}</li>
+              {
+                {
+                  let base_fade_delay = 200;
+                  for (index, subtitle in subtitles) {
+                    let delay = base_fade_delay * (index + 1) + 400 * index;
+                    <li class="fadeInUp" style="animation-delay: $(delay)ms">{subtitle}</li>
+                  }
                 }
-              }}
+              }
             </ul>
           </aside>
           <ul class="Masthead-socialIcons">
-            {for (social in settings.socials) {
-              <li class="Masthead-socialIconWrapper">
-                <a class="Masthead-socialIconLink" target="_blank" href={social.url}>
-                  <img
-                    class="Masthead-socialIcon"
-                    loading="eager"
-                    src={social.icon}
-                    alt={social.name}
-                    height="20"
-                    width="20"
-                  />
-                </a>
-              </li>
-            }}
+            {
+              for (social in settings.socials) {
+                <li class="Masthead-socialIconWrapper">
+                  <a class="Masthead-socialIconLink" target="_blank" href={social.url}>
+                    <img
+                      class="Masthead-socialIcon"
+                      loading="eager"
+                      src={social.icon}
+                      alt={social.name}
+                      height="20"
+                      width="20" />
+                  </a>
+                </li>
+              }
+            }
           </ul>
         </div>
       </div>
@@ -369,49 +370,49 @@ component Masthead {
 }
 
 component ButtonPrimary {
-	#Portal(key: "stylesheets", push: <link rel="stylesheet" href="/css/ButtonPrimary.css" />);
+  #Portal(key: "stylesheets", push: <link rel="stylesheet" href="/css/ButtonPrimary.css" />);
 
   let class? = #String;
-  
+
   let href = #String;
   let text = #String;
-  
-	let title? = #String;
+
+  let title? = #String;
   let target? = #String;
 
-	<a
-		class="ButtonPrimary $(class)"
-		href={href}
-		title={title}
-		target={target}
-		rel={if (target == "_blank") "noopener" else ""}
-	>
-		{text}
-
-		<aside class="ButtonPrimary-iconWrapper">
-			<svg 
-				class="ButtonPrimary-icon"
-				xmlns="http://www.w3.org/2000/svg"
-				fill="none" viewBox="0 0 24 24"
-				stroke-width="1.5"
-				stroke="currentColor"
-			>
-				<path
-					stroke-linecap="round"
-					stroke-linejoin="round"
-					d="m4.5 19.5 15-15m0 0H8.25m11.25 0v11.25"
-				/>
-			</svg>
-		</aside>
-	</a>
+  <a
+    class="ButtonPrimary $(class)"
+    href={href}
+    title={title}
+    target={target}
+    rel={if (target == "_blank") "noopener" else ""}
+  >
+    {text}
+
+    <aside class="ButtonPrimary-iconWrapper">
+      <svg
+        class="ButtonPrimary-icon"
+        xmlns="http://www.w3.org/2000/svg"
+        fill="none"
+        viewBox="0 0 24 24"
+        stroke-width="1.5"
+        stroke="currentColor"
+      >
+        <path
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          d="m4.5 19.5 15-15m0 0H8.25m11.25 0v11.25" />
+      </svg>
+    </aside>
+  </a>
 }
 
 component ModuleContainer {
-	#Portal(key: "stylesheets", push: <link rel="stylesheet" href="/css/ModuleContainer.css" />);
-	
-	<div class="ModuleContainer">
-		{#Slot(key: "", min: 1)}
-	</div>
+  #Portal(key: "stylesheets", push: <link rel="stylesheet" href="/css/ModuleContainer.css" />);
+
+  <div class="ModuleContainer">
+    {#Slot(key: "", min: 1)}
+  </div>
 }
 
 component Video {
@@ -425,8 +426,10 @@ component Video {
   let loop? = #Boolean;
   let autoplay? = #Boolean;
 
-  let muted? = #Boolean :: fn v -> v |> Base.Fn.default(autoplay);
-  let playsinline? = #Boolean :: fn v -> v |> Base.Fn.default(autoplay);
+  let muted? = #Boolean :: fn (v) -> v
+    |> Base_Fn.default(autoplay);
+  let playsinline? = #Boolean :: fn (v) -> v
+    |> Base_Fn.default(autoplay);
 
   <video
     class="Video $(class)"
@@ -436,132 +439,144 @@ component Video {
     controls={controls}
     loop={loop}
     muted={muted}
-    playsinline={playsinline}
-  ></video>
+    playsinline={playsinline} />
 }
 
-component SectionStart() {
-	#Portal(key: "stylesheets", push: <link rel="stylesheet" href="/css/SectionStart.css" />);
+component SectionStart {
+  #Portal(key: "stylesheets", push: <link rel="stylesheet" href="/css/SectionStart.css" />);
 
   let class? = #String;
   let anchor? = #String;
   let title? = #String;
-  let align? = #String :: fn v -> v |> Base.Fn.default("center");
-	
-	<ModuleContainer>
-		<div class="SectionStart SectionStart--$(align) $(class)" id={anchor}>
-			{if (title) {
-				<h2 class="SectionStart-title">{title}</h2>
-			}}
-		</div>
-	</ModuleContainer>
+  let align? = #String :: fn (v) -> v
+    |> Base_Fn.default("center");
+
+  <ModuleContainer>
+    <div class="SectionStart SectionStart--$(align) $(class)" id={anchor}>
+      {if (title) { <h2 class="SectionStart-title">{title}</h2> }}
+    </div>
+  </ModuleContainer>
 }
 
 component ProjectSlider {
-	#Portal(key: "stylesheets", push: <link rel="stylesheet" href="/css/ProjectSlider.css" />);
-	#Portal(key: "scripts", push: <script src="/js/ProjectSlider.js" defer={true} />);
-
-	let projects = #GetContext(key: "projects");
-
-	<ModuleContainer>
-		<div class="ProjectSlider">
-			<div class="ProjectSlider-container">
-				<aside class="ProjectSlider-autoplayProgress"></aside>
-				<div class="ProjectSlider-slider swiper">
-					<div class="swiper-wrapper">
-						{for project in projects {
-							<div
-								class="ProjectSlider-slide swiper-slide"
-							>
-								<div class="ProjectSlider-slideContent">
-									<ul class="ProjectSlider-slideBadges">
-										{for (job in project.jobs) {
-											<li class="ProjectSlider-slideBadge">{job}</li>
-										}}
-									</ul>
-									<h3 class="ProjectSlider-slideTitle">
-										{Base.String.nl2br(project.title)}
-									</h3>
-									<div class="ProjectSlider-slideText">
-										{Base.String.nl2br(project.intro)}
-									</div>
-									<ButtonSecondary 
-										class="ProjectSlider-slideButton swiper-no-swiping"
-										text="More Details"
-										href={project.url}
-									/>
-								</div>
-								<div class="ProjectSlider-slideImageWrapper">
-									<Image class="ProjectSlider-slideImage" src={project.image} />
-								</div>
-							</div>
-						}}
-					</div>
-					<ul class="ProjectSlider-navigation">
-						<li class="ProjectSlider-navigationButton ProjectSlider-navigationButton--prev swiper-button-prev">
-							<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
-								<path stroke-linecap="round" stroke-linejoin="round" d="M15.75 19.5 8.25 12l7.5-7.5" />
-							</svg>
-						</li>
-						<li class="ProjectSlider-navigationButton ProjectSlider-navigationButton--next swiper-button-next">
-							<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
-								<path stroke-linecap="round" stroke-linejoin="round" d="m8.25 4.5 7.5 7.5-7.5 7.5" />
-							</svg>
-						</li>
-					</ul>
-				</div>
-			</div>
-		</div>
-	</ModuleContainer>
+  #Portal(key: "stylesheets", push: <link rel="stylesheet" href="/css/ProjectSlider.css" />);
+  #Portal(key: "scripts", push: <script src="/js/ProjectSlider.js" defer={true} />);
+
+  let projects = #GetContext(key: "projects");
+
+  <ModuleContainer>
+    <div class="ProjectSlider">
+      <div class="ProjectSlider-container">
+        <aside class="ProjectSlider-autoplayProgress" />
+        <div class="ProjectSlider-slider swiper">
+          <div class="swiper-wrapper">
+            {
+              for (project in projects) {
+                <div class="ProjectSlider-slide swiper-slide">
+                  <div class="ProjectSlider-slideContent">
+                    <ul class="ProjectSlider-slideBadges">
+                      {
+                        for (job in project.jobs) {
+                          <li class="ProjectSlider-slideBadge">{job}</li>
+                        }
+                      }
+                    </ul>
+                    <h3 class="ProjectSlider-slideTitle">
+                      {Base_String.nl2br(project.title)}
+                    </h3>
+                    <div class="ProjectSlider-slideText">
+                      {Base_String.nl2br(project.intro)}
+                    </div>
+                    <ButtonSecondary
+                      class="ProjectSlider-slideButton swiper-no-swiping"
+                      text="More Details"
+                      href={project.url}
+                    />
+                  </div>
+                  <div class="ProjectSlider-slideImageWrapper">
+                    <Image class="ProjectSlider-slideImage" src={project.image} />
+                  </div>
+                </div>
+              }
+            }
+          </div>
+          <ul class="ProjectSlider-navigation">
+            <li
+              class="ProjectSlider-navigationButton ProjectSlider-navigationButton--prev swiper-button-prev"
+            >
+              <svg
+                xmlns="http://www.w3.org/2000/svg"
+                fill="none"
+                viewBox="0 0 24 24"
+                stroke-width="1.5"
+                stroke="currentColor"
+              >
+                <path stroke-linecap="round" stroke-linejoin="round" d="M15.75 19.5 8.25 12l7.5-7.5" />
+              </svg>
+            </li>
+            <li
+              class="ProjectSlider-navigationButton ProjectSlider-navigationButton--next swiper-button-next"
+            >
+              <svg
+                xmlns="http://www.w3.org/2000/svg"
+                fill="none"
+                viewBox="0 0 24 24"
+                stroke-width="1.5"
+                stroke="currentColor"
+              >
+                <path stroke-linecap="round" stroke-linejoin="round" d="m8.25 4.5 7.5 7.5-7.5 7.5" />
+              </svg>
+            </li>
+          </ul>
+        </div>
+      </div>
+    </div>
+  </ModuleContainer>
 }
 
 component ButtonSecondary {
-	#Portal(key: "stylesheets", push: <link rel="stylesheet" href="/css/ButtonSecondary.css" />);
+  #Portal(key: "stylesheets", push: <link rel="stylesheet" href="/css/ButtonSecondary.css" />);
 
   let class? = #String;
-  
+
   let href? = #String;
   let text = #String;
-  
-	let title? = #String;
+
+  let title? = #String;
   let target? = #String;
 
-	let content = <>
-		{text}
-
-		<aside class="ButtonSecondary-iconWrapper">
-			<svg
-				class="ButtonSecondary-icon"
-				xmlns="http://www.w3.org/2000/svg"
-				fill="none"
-				viewBox="0 0 24 24"
-				stroke-width="1.5"
-				stroke="currentColor"
-			>
-				<path
-					stroke-linecap="round"
-					stroke-linejoin="round"
-					d="M13.5 4.5 21 12m0 0-7.5 7.5M21 12H3"
-				/>
-			</svg>
-		</aside>
-	</>;
-
-	if (href) {	
-		<a
-			class="ButtonSecondary $(class)"
-			href={href}
-			title={title}
-			target={target}
-			rel={if (target == "_blank") "noopener" else ""}
-		>
-			{content}
-		</a>
-	} else {
-		<span class="ButtonSecondary $(class)">
-			{content}
-		</span>
-	}
+  let content = <>
+    {text}
+
+    <aside class="ButtonSecondary-iconWrapper">
+      <svg
+        class="ButtonSecondary-icon"
+        xmlns="http://www.w3.org/2000/svg"
+        fill="none"
+        viewBox="0 0 24 24"
+        stroke-width="1.5"
+        stroke="currentColor"
+      >
+        <path stroke-linecap="round" stroke-linejoin="round" d="M13.5 4.5 21 12m0 0-7.5 7.5M21 12H3" />
+      </svg>
+    </aside>
+  </>;
+
+  if (href) {
+    <a
+      class="ButtonSecondary $(class)"
+      href={href}
+      title={title}
+      target={target}
+      rel={if (target == "_blank") "noopener" else ""}
+    >
+      {content}
+    </a>
+  } else {
+    <span class="ButtonSecondary $(class)">
+      {content}
+    </span>
+  }
 }
 
 component Image {
@@ -569,30 +584,23 @@ component Image {
 
   let class? = #String;
   let style? = #String;
-  
+
   let src = #String;
   let alt? = #String;
   let width? = #Int;
   let height? = #Int;
   let caption? = #String;
-  let loading? = #String :: fn v -> v |> Base.Fn.default("lazy");
+  let loading? = #String :: fn (v) -> v
+    |> Base_Fn.default("lazy");
 
   <figure class="Image $(class)" style={style}>
     <picture class="Image-imageWrapper">
-      <img
-        class="Image-image"
-        width={width} 
-        height={height} 
-        src={src}
-        alt={alt}
-        loading={loading}
-      />
+      <img class="Image-image" width={width} height={height} src={src} alt={alt} loading={loading} />
     </picture>
-    {if (caption) {
-      <figcaption class="Image-caption">{caption}</figcaption>
-    }}
+    {if (caption) { <figcaption class="Image-caption">{caption}</figcaption> }}
   </figure>
 }
+
 component ProjectTeaserList {
   #Portal(key: "stylesheets", push: <link rel="stylesheet" href="/css/ProjectTeaserList.css" />);
 
@@ -600,14 +608,16 @@ component ProjectTeaserList {
 
   <ModuleContainer>
     <div class="ProjectTeaserList">
-      {for project in projects {
-        <ProjectTeaser
-          url={project.url}
-          image={project.image}
-          title={Base.String.nl2br(project.title)}
-          jobs={project.jobs}
-        />
-      }}
+      {
+        for (project in projects) {
+          <ProjectTeaser
+            url={project.url}
+            image={project.image}
+            title={Base_String.nl2br(project.title)}
+            jobs={project.jobs}
+          />
+        }
+      }
     </div>
   </ModuleContainer>
 }
@@ -617,21 +627,20 @@ component ProjectTeaser {
   let image = #String;
   let title = #String;
   let jobs = #Array(of: #String);
-  
+
   let base_fade_delay = 200;
 
   <a href={url} class="ProjectTeaser">
     <img class="ProjectTeaser-image" src={image} alt="" />
     <ul class="ProjectTeaser-badges">
-      {for index, job in jobs {
-        let delay = base_fade_delay * (index + 1) + 400 * index;
-        <li 
-          class="ProjectTeaser-badge"
-          style="animation-delay: $(delay)ms"
-        >
-          {job}
-        </li>
-      }}
+      {
+        for (index, job in jobs) {
+          let delay = base_fade_delay * (index + 1) + 400 * index;
+          <li class="ProjectTeaser-badge" style="animation-delay: $(delay)ms">
+            {job}
+          </li>
+        }
+      }
     </ul>
     <div class="ProjectTeaser-content">
       <h3 class="ProjectTeaser-title">
@@ -646,19 +655,25 @@ component Gallery {
   #Portal(key: "stylesheets", push: <link rel="stylesheet" href="/css/Gallery.css" />);
 
   let title = #String;
-  let items = #Array(of: #Record(of: {
-    position?: #String,
-    type: #String,
-    url: #String,
-  }));
+  let items = #Array(
+    of: #Record(
+      of: {
+        position?: #String,
+        type: #String,
+        url: #String,
+      },
+    ),
+  );
 
-  let columns = items |> Base.Array.chunk(2);
+  let columns = items
+    |> Base_Array.chunk(2);
 
   let numColumnGroups = 5;
-  let centerColumnGroups = Base.Math.ceil(numColumnGroups / 2);
+  let centerColumnGroups = Base_Math.ceil(numColumnGroups / 2);
   let columnGroups = {
-    let groups = columns |> Base.Array.group(numColumnGroups);
-    [groups[0], groups[1], groups[4], groups[2], groups[3]];
+    let groups = columns
+      |> Base_Array.group(numColumnGroups);
+    [groups[0], groups[1], groups[4], groups[2], groups[3]]
   };
 
   <ModuleContainer>
@@ -667,45 +682,49 @@ component Gallery {
         {title}
       </h2>
       <div class="Gallery-mediaRow">
-        {for index, columnGroup in columnGroups {
-          let offsetShift = if(index >= centerColumnGroups - 1) {
-            (centerColumnGroups - 1 - index) * 60
-          } else {
-            0
-          };
-          let offset = index * 60 + offsetShift * 2;
-
-          for column in columnGroup {
-            <div
-              class="Gallery-mediaColumn"
-              style="margin-top: $(offset)px;"
-            >
-              {for item in column {
-                let position = item.position |> Base.Fn.default("center center");
-                
-                <div class="Gallery-mediaWrapper">
-                  {if item.type == "video" {
-                    <Video 
-                      class="Gallery-media"
-                      style="object-position: $(position)"
-                      url={item.url}
-                      autoplay={true}
-                      muted={true}
-                      loop={true}
-                    />
-                  } else {
-                    <Image
-                      style="object-position: $(position)"
-                      class="Gallery-media"
-                      src={item.url}
-                      loading="lazy"
-                    />
-                  }}
-                </div>
-              }}
-            </div>
+        {
+          for (index, columnGroup in columnGroups) {
+            let offsetShift = if (index >= centerColumnGroups - 1) {
+              (centerColumnGroups - 1 - index) * 60
+            } else {
+              0
+            };
+            let offset = index * 60 + offsetShift * 2;
+
+            for (column in columnGroup) {
+              <div class="Gallery-mediaColumn" style="margin-top: $(offset)px;">
+                {
+                  for (item in column) {
+                    let position = item.position
+                      |> Base_Fn.default("center center");
+
+                    <div class="Gallery-mediaWrapper">
+                      {
+                        if (item.type == "video") {
+                          <Video
+                            class="Gallery-media"
+                            style="object-position: $(position)"
+                            url={item.url}
+                            autoplay={true}
+                            muted={true}
+                            loop={true}
+                          />
+                        } else {
+                          <Image
+                            style="object-position: $(position)"
+                            class="Gallery-media"
+                            src={item.url}
+                            loading="lazy"
+                          />
+                        }
+                      }
+                    </div>
+                  }
+                }
+              </div>
+            }
           }
-        }}
+        }
       </div>
     </div>
   </ModuleContainer>
@@ -715,14 +734,11 @@ component AboutMe {
   #Portal(key: "stylesheets", push: <link rel="stylesheet" href="/css/AboutMe.css" />);
 
   let image = #String;
-  let image_alignment = #String :: fn v -> v |> Base.Fn.default("left");
+  let image_alignment = #String :: fn (v) -> v
+    |> Base_Fn.default("left");
 
   let title? = #String;
-  let content = #Slot(
-    key: "",
-		min: 1,
-		constraints: [Copytext, Bulletlist],
-	);
+  let content = #Slot(key: "", min: 1, constraints: [Copytext, Bulletlist]);
 
   <ModuleContainer>
     <section class="AboutMe AboutMe--$(image_alignment)">
@@ -730,15 +746,15 @@ component AboutMe {
         <Image src={image} alt="" />
       </div>
       <div class="AboutMe-content">
-        {if title {
-          <h2 class="AboutMe-title">{title}</h2>
-        }}
+        {if (title) { <h2 class="AboutMe-title">{title}</h2> }}
         <div class="AboutMe-modules">
-          {for (item in content) {
-            <div class="AboutMe-moduleItem">
-              {item}
-            </div>
-          }}
+          {
+            for (item in content) {
+              <div class="AboutMe-moduleItem">
+                {item}
+              </div>
+            }
+          }
         </div>
       </div>
     </section>
@@ -748,36 +764,38 @@ component AboutMe {
 component Copytext {
   #Portal(key: "stylesheets", push: <link rel="stylesheet" href="/css/Copytext.css" />);
 
-  let text = #String :: Base.String.nl2br;
+  let text = #String :: Base_String.nl2br;
 
-	<div class="Copytext">
-		{text}
-	</div>
+  <div class="Copytext">
+    {text}
+  </div>
 }
 
 component Bulletlist {
   #Portal(key: "stylesheets", push: <link rel="stylesheet" href="/css/Bulletlist.css" />);
 
-	let title? = #String;
-
-	let items = #Array(of: #Record(of: {
-		title?: #String,
-		text: #String,
-	}));
-
-	<div class="Bulletlist">
-		{if (title) {
-			<h4 class="Bulletlist-title">{title}</h4>
-		}}
-		<ul class="Bulletlist-items">
-			{for (item in items) {
-				<li class="Bulletlist-item">
-					{if (item.title) {
-						<span class="Bulletlist-itemTitle">{item.title}</span>
-					}}
-					<span class="Bulletlist-itemText">{item.text}</span>
-				</li>
-			}}
-		</ul>
-	</div>
+  let title? = #String;
+
+  let items = #Array(
+    of: #Record(
+      of: {
+        title?: #String,
+        text: #String,
+      },
+    ),
+  );
+
+  <div class="Bulletlist">
+    {if (title) { <h4 class="Bulletlist-title">{title}</h4> }}
+    <ul class="Bulletlist-items">
+      {
+        for (item in items) {
+          <li class="Bulletlist-item">
+            {if (item.title) { <span class="Bulletlist-itemTitle">{item.title}</span> }}
+            <span class="Bulletlist-itemText">{item.text}</span>
+          </li>
+        }
+      }
+    </ul>
+  </div>
 }
diff --git a/lib/02_parsing/Ast.ml b/lib/02_parsing/Ast.ml
index 65886e9..3e2bad0 100644
--- a/lib/02_parsing/Ast.ml
+++ b/lib/02_parsing/Ast.ml
@@ -89,7 +89,6 @@ and expression_desc =
       function_definition : expression;
       arguments : expression list;
     }
-  | UppercaseIdentifierPathExpression of string list
   | UppercaseIdentifierExpression of string
   | LowercaseIdentifierExpression of string
   | TagExpression of tag
@@ -118,7 +117,6 @@ and statement = {
 and statement_desc =
   | BreakStatement of int
   | ContinueStatement of int
-  | UseStatement of uppercase_identifier option * expression
   | OptionalMutableLetStatement of lowercase_identifier * expression
   | OptionalLetStatement of lowercase_identifier * expression
   | MutableLetStatement of lowercase_identifier * expression
@@ -163,8 +161,6 @@ let show_expression expr =
   | { expression_loc = _; expression_desc = ExternalFunction _ } -> "ExternalFunction"
   | { expression_loc = _; expression_desc = Function _ } -> "Function"
   | { expression_loc = _; expression_desc = FunctionCall _ } -> "FunctionCall"
-  | { expression_loc = _; expression_desc = UppercaseIdentifierPathExpression _ } ->
-      "UppercaseIdentifierPathExpression"
   | { expression_loc = _; expression_desc = UppercaseIdentifierExpression _ } ->
       "UppercaseIdentifierExpression"
   | { expression_loc = _; expression_desc = LowercaseIdentifierExpression _ } ->
diff --git a/lib/02_parsing/Parser.ml b/lib/02_parsing/Parser.ml
index 6d292d8..1818f40 100644
--- a/lib/02_parsing/Parser.ml
+++ b/lib/02_parsing/Parser.ml
@@ -497,32 +497,6 @@ module Rules = struct
           Some
             (Parsetree.P_MutationStatement
                (P_Lowercase_Id (identifier, identifier_location), expression))
-      (* PARSING USE STATEMENT *)
-      | Token.KEYWORD_USE ->
-          next t;
-          let is_assignment = peek t = Token.EQUAL in
-          if is_assignment then (
-            let identifier = Helpers.expect_identifier ~typ:`Upper t in
-            t |> expect Token.EQUAL;
-            let expression =
-              match parse_expression t with
-              | Some expression -> expression
-              | None ->
-                  Diagnostics.raise_error
-                    t.token.location
-                    "Expected expression as right hand side of use statement"
-            in
-            Some (Parsetree.P_UseStatement (Some (P_Uppercase_Id identifier), expression)))
-          else (
-            let expression =
-              match parse_expression t with
-              | Some expression -> expression
-              | None ->
-                  Diagnostics.raise_error
-                    t.token.location
-                    "Expected to see a library next to the use keyword."
-            in
-            Some (Parsetree.P_UseStatement (None, expression)))
       | _ ->
           let* expr = parse_expression t in
           Some (Parsetree.P_ExpressionStatement expr)
@@ -731,31 +705,11 @@ module Rules = struct
           next t;
           Option.some
           @@ (false, Parsetree.P_LowercaseIdentifierExpression identifier, end_location)
-      | Token.IDENT_UPPER identifier -> (
+      | Token.IDENT_UPPER identifier ->
           let end_location = t.token.location in
           next t;
-          let rec get_path list =
-            match t.token.typ with
-            | Token.DOT -> (
-                match peek t with
-                | Token.IDENT_UPPER i ->
-                    next t;
-                    next t;
-                    get_path (i :: list)
-                | _ -> List.rev list)
-            | _ -> List.rev list
-          in
-          match get_path [ identifier ] with
-          | [ identifier ] ->
-              Option.some
-              @@ ( false,
-                   Parsetree.P_UppercaseIdentifierExpression identifier,
-                   end_location )
-          | path ->
-              Option.some
-              @@ ( false,
-                   Parsetree.P_UppercaseIdentifierPathExpression path,
-                   t.prev_token.location ))
+          Option.some
+          @@ (false, Parsetree.P_UppercaseIdentifierExpression identifier, end_location)
       (* PARSING VALUE EXPRESSION *)
       | Token.DOUBLE_QUOTE ->
           next t;
diff --git a/lib/02_parsing/Parsetree.ml b/lib/02_parsing/Parsetree.ml
index 64b4047..7782b25 100644
--- a/lib/02_parsing/Parsetree.ml
+++ b/lib/02_parsing/Parsetree.ml
@@ -93,7 +93,6 @@ and expression_desc =
       function_definition : expression;
       arguments : expression list;
     }
-  | P_UppercaseIdentifierPathExpression of string list
   | P_UppercaseIdentifierExpression of string
   | P_LowercaseIdentifierExpression of string
   | P_TagExpression of tag
@@ -123,7 +122,6 @@ and statement = {
 and statement_desc =
   | P_BreakStatement of int
   | P_ContinueStatement of int
-  | P_UseStatement of uppercase_identifier option * expression
   | P_OptionalMutableLetStatement of lowercase_identifier * expression
   | P_OptionalLetStatement of lowercase_identifier * expression
   | P_MutableLetStatement of lowercase_identifier * expression
diff --git a/lib/02_parsing/Token.ml b/lib/02_parsing/Token.ml
index 0772da5..69d0ad3 100644
--- a/lib/02_parsing/Token.ml
+++ b/lib/02_parsing/Token.ml
@@ -48,7 +48,6 @@ type token_type =
   | GREATER_EQUAL
   | LESS_EQUAL
   | PLUSPLUS
-  | KEYWORD_USE
   | KEYWORD_FN
   | KEYWORD_LET
   | KEYWORD_MUTABLE
@@ -139,7 +138,6 @@ let to_string = function
   | STAR_STAR -> "**"
   | SLASH -> "/"
   | PERCENT -> "%"
-  | KEYWORD_USE -> "use"
   | KEYWORD_FN -> "fn"
   | KEYWORD_LET -> "let"
   | KEYWORD_MUTABLE -> "mutable"
@@ -173,7 +171,6 @@ let to_string = function
 ;;
 
 let is_keyword = function
-  | KEYWORD_USE
   | KEYWORD_FN
   | KEYWORD_LET
   | KEYWORD_MUTABLE
@@ -254,7 +251,6 @@ let is_keyword = function
 ;;
 
 let keyword_of_string = function
-  | "use" -> Some KEYWORD_USE
   | "fn" -> Some KEYWORD_FN
   | "let" -> Some KEYWORD_LET
   | "mutable" -> Some KEYWORD_MUTABLE
diff --git a/lib/02_parsing/Token.mli b/lib/02_parsing/Token.mli
index bf4af25..b3addc1 100644
--- a/lib/02_parsing/Token.mli
+++ b/lib/02_parsing/Token.mli
@@ -48,7 +48,6 @@ type token_type =
   | GREATER_EQUAL
   | LESS_EQUAL
   | PLUSPLUS
-  | KEYWORD_USE
   | KEYWORD_FN
   | KEYWORD_LET
   | KEYWORD_MUTABLE
diff --git a/lib/02_parsing/Transformer.ml b/lib/02_parsing/Transformer.ml
index 3741e42..654194f 100644
--- a/lib/02_parsing/Transformer.ml
+++ b/lib/02_parsing/Transformer.ml
@@ -118,9 +118,6 @@ and transform_function_call env function_definition arguments =
   let env, arguments = List.fold_map ~init:env ~f:transform_expression arguments in
   (env, FunctionCall { function_definition; arguments })
 
-and transform_uppercase_id_path_expression env path =
-  (env, UppercaseIdentifierPathExpression path)
-
 and transform_uppercase_id_expression env id = (env, UppercaseIdentifierExpression id)
 and transform_lowercase_id_expression env id = (env, LowercaseIdentifierExpression id)
 
@@ -464,8 +461,6 @@ and transform_expression env (exression : Parsetree.expression) =
     | P_Function { parameters; body } -> transform_function env parameters body
     | P_FunctionCall { function_definition; arguments } ->
         transform_function_call env function_definition arguments
-    | P_UppercaseIdentifierPathExpression path ->
-        transform_uppercase_id_path_expression env path
     | P_UppercaseIdentifierExpression id -> transform_uppercase_id_expression env id
     | P_LowercaseIdentifierExpression id -> transform_lowercase_id_expression env id
     | P_TagExpression tag -> transform_tag env tag
@@ -484,11 +479,6 @@ and transform_expression env (exression : Parsetree.expression) =
 and transform_break_stmt env s = (env, BreakStatement s)
 and transform_continue_stmt env s = (env, ContinueStatement s)
 
-and transform_use_stmt env id expr =
-  let env, id = Option.fold_map ~init:env ~f:transform_uppercase_id id in
-  let env, expr = transform_expression env expr in
-  (env, UseStatement (id, expr))
-
 and transform_optional_mutable_let env id expr =
   let env = { env with Env.current_identifier = Some (`Optional, id) } in
   let env, id = transform_lowercase_id env id in
@@ -531,7 +521,6 @@ and transform_statement env (statement : Parsetree.statement) =
     match statement.statement_desc with
     | P_BreakStatement s -> transform_break_stmt env s
     | P_ContinueStatement s -> transform_continue_stmt env s
-    | P_UseStatement (id, expr) -> transform_use_stmt env id expr
     | P_OptionalMutableLetStatement (id, expr) ->
         transform_optional_mutable_let env id expr
     | P_OptionalLetStatement (id, expr) -> transform_optional_let env id expr
diff --git a/lib/02_parsing/stdlib/Base.pi b/lib/02_parsing/stdlib/Base.pi
deleted file mode 100644
index 9a811cd..0000000
--- a/lib/02_parsing/stdlib/Base.pi
+++ /dev/null
@@ -1,7 +0,0 @@
-library Base {
-  use Array = Base__Array;
-  use Char = Base__Char;
-  use Fn = Base__Fn;
-  use Math = Base__Math;
-  use String = Base__String;
-}
\ No newline at end of file
diff --git a/lib/02_parsing/stdlib/Base__Array.pi b/lib/02_parsing/stdlib/Base_Array.pi
similarity index 58%
rename from lib/02_parsing/stdlib/Base__Array.pi
rename to lib/02_parsing/stdlib/Base_Array.pi
index 1d36376..71b8d6f 100644
--- a/lib/02_parsing/stdlib/Base__Array.pi
+++ b/lib/02_parsing/stdlib/Base_Array.pi
@@ -1,4 +1,4 @@
-library Base__Array {
+library Base_Array {
   let make = fn (length) -> {
     0..length
   };
@@ -17,38 +17,43 @@ library Base__Array {
 
   let last = fn (array) -> {
     let len = length(array);
-    if len > 0 {
+    if (len > 0) {
       array[len - 1]
     }
   };
 
   let take_until = fn (array, condition) -> {
     for (item in array) {
-      if(condition(item)) break;
+      if (condition(item)) {
+        break;
+      };
       item
     }
   };
 
   let slice = fn (array, offset, length) -> {
     for (index, item in array) {
-      if(index < offset) continue;
-      if(index == length + offset) break;
+      if (index < offset) {
+        continue;
+      };
+      if (index == length + offset) {
+        break;
+      };
       item
     }
   };
 
   let chunk = fn (array, size) -> {
-    let len = Base.Array.length(array);
-    let x = Base.Math.ceil(len / size);
-    0..x |> Base.Array.mapi(fn (index, item) -> {
-      Base.Array.slice(array, index * size, size)
-    });
+    let len = length(array);
+    let x = Base_Math.ceil(len / size);
+    0..x
+      |> mapi(fn (index, item) -> { slice(array, index * size, size) })
   };
 
   let join = fn (array, sep) -> {
     let mutable result = "";
     for (index, item in array) {
-      if(index > 0) {
+      if (index > 0) {
         result := result ++ sep;
       };
       result := result ++ item;
@@ -81,16 +86,16 @@ library Base__Array {
   };
 
   let partition = fn (array, condition) -> {
-    let len = Base.Array.length(array);
+    let len = length(array);
     let part = fn (yes, no, index) -> {
-      if index == len {
+      if (index == len) {
         [yes, no]
       } else {
         let item = array[index];
-        if condition(item) {
-          part(yes <- item, no, index + 1);
+        if (condition(item)) {
+          part(yes <- item, no, index + 1)
         } else {
-          part(yes, no <- item, index + 1);
+          part(yes, no <- item, index + 1)
         }
       }
     };
@@ -98,16 +103,16 @@ library Base__Array {
   };
 
   let filter = fn (array, condition) -> {
-    let len = Base.Array.length(array);
+    let len = length(array);
     let aux = fn (acc, index) -> {
-      if index == len {
+      if (index == len) {
         acc
       } else {
         let item = array[index];
-        if condition(item) {
-          aux(acc <- item, index + 1);
+        if (condition(item)) {
+          aux(acc <- item, index + 1)
         } else {
-          aux(acc, index + 1);
+          aux(acc, index + 1)
         }
       }
     };
@@ -118,14 +123,14 @@ library Base__Array {
   let keep = filter;
 
   let find = fn (array, condition) -> {
-    let len = Base.Array.length(array);
+    let len = length(array);
     let aux = fn (index) -> {
-      if index < len {
+      if (index < len) {
         let item = array[index];
-        if condition(item) {
+        if (condition(item)) {
           item
         } else {
-          aux(index + 1);
+          aux(index + 1)
         }
       }
     };
@@ -134,33 +139,33 @@ library Base__Array {
   };
 
   let exists = fn (array, condition) -> {
-    let len = Base.Array.length(array);
+    let len = length(array);
     let aux = fn (index) -> {
-      if index < len {
+      if (index < len) {
         let item = array[index];
-        if condition(item) {
+        if (condition(item)) {
           true
         } else {
-          aux(index + 1);
+          aux(index + 1)
         }
       } else {
         false
       }
     };
 
-    aux(0);
+    aux(0)
   };
 
   let some = exists;
 
   let for_all = fn (array, condition) -> {
-    let len = Base.Array.length(array);
+    let len = length(array);
     let aux = fn (acc, index) -> {
-      if index == len || acc == false {
+      if (index == len || acc == false) {
         acc
       } else {
         let item = array[index];
-        aux(acc && condition(item), index + 1);
+        aux(acc && condition(item), index + 1)
       }
     };
 
@@ -169,15 +174,15 @@ library Base__Array {
 
   let every = for_all;
 
-  let fold_lefti = fn(array, init, f) -> {
-    let len = Base.Array.length(array);
+  let fold_lefti = fn (array, init, f) -> {
+    let len = length(array);
     let aux = fn (acc, index) -> {
       if (index == len || acc == false) {
         acc
       } else {
         let item = array[index];
         let acc = f(acc, item, index);
-        aux(acc, index + 1);
+        aux(acc, index + 1)
       }
     };
 
@@ -186,25 +191,23 @@ library Base__Array {
 
   let reducei = fold_lefti;
 
-  let fold_left = fn(array, init, f) -> {
-    fold_lefti(array, init, fn (acc, curr, index) -> {
-      f(acc, curr);
-    });
+  let fold_left = fn (array, init, f) -> {
+    fold_lefti(array, init, fn (acc, curr, index) -> { f(acc, curr) })
   };
 
   let reduce = fold_left;
 
   let group = fn (array, size) -> {
-    let array_length = Base.Array.length(array);
-    let group_size = Base.Math.floor(array_length / size);
-
-    0..size |> fold_lefti([], fn (acc, curr, index) -> {
-      acc <- Base.Array.slice(
-        array,
-        index * group_size,
-        if(index == size - 1) array_length else group_size
-      );
-    });
+    let array_length = length(array);
+    let group_size = Base_Math.floor(array_length / size);
+
+    0..size
+      |> fold_lefti(
+      [],
+      fn (acc, curr, index) -> {
+        acc <- slice(array, index * group_size, if (index == size - 1) array_length else group_size)
+      },
+    )
   };
 
   let nth = fn (array, index) -> {
@@ -213,33 +216,35 @@ library Base__Array {
 
   let sort = fn (array, f) -> {
     let merge = fn (a, b) -> {
-      let len_a = Base.Array.length(a);
-      if len_a == 0 {
+      let len_a = length(a);
+      if (len_a == 0) {
         b
       } else {
-        let len_b = Base.Array.length(b);
-        if len_b == 0 {
+        let len_b = length(b);
+        if (len_b == 0) {
           a
         } else {
           let first_a = a[0];
           let first_b = b[0];
-          if f(first_a, first_b) < 0 {
-            [first_a] @@ merge(Base.Array.slice(a, 1, len_a), b)
+          if (f(first_a, first_b) < 0) {
+            [first_a] @@ merge(slice(a, 1, len_a), b)
           } else {
-            [first_b] @@ merge(a, Base.Array.slice(b, 1, len_b))
+            [first_b] @@ merge(a, slice(b, 1, len_b))
           }
         }
       }
     };
 
-    let len = Base.Array.length(array);
-    if len < 2 {
+    let len = length(array);
+    if (len < 2) {
       array
     } else {
-        let h = Base.Math.ceil(len / 2);
-        let first_half = array |> Base.Array.slice(0, h);
-        let second_half = array |> Base.Array.slice(h, len);
-        merge(sort(first_half, f), sort(second_half, f));
+      let h = Base_Math.ceil(len / 2);
+      let first_half = array
+        |> slice(0, h);
+      let second_half = array
+        |> slice(h, len);
+      merge(sort(first_half, f), sort(second_half, f))
     }
   };
 
@@ -257,4 +262,4 @@ library Base__Array {
 
     result
   };
-}
\ No newline at end of file
+}
diff --git a/lib/02_parsing/stdlib/Base__Char.pi b/lib/02_parsing/stdlib/Base_Char.pi
similarity index 89%
rename from lib/02_parsing/stdlib/Base__Char.pi
rename to lib/02_parsing/stdlib/Base_Char.pi
index d0a2388..2c87b31 100644
--- a/lib/02_parsing/stdlib/Base__Char.pi
+++ b/lib/02_parsing/stdlib/Base_Char.pi
@@ -1,4 +1,4 @@
-library Base__Char {
+library Base_Char {
   let is_whitespace = fn (char) -> {
     char == ' ' || char == '\012' || char == '\n' || char == '\r' || char == '\t'
   };
@@ -6,4 +6,4 @@ library Base__Char {
   let is_newline = fn (char) -> {
     char == '\n' || char == '\r'
   };
-}
\ No newline at end of file
+}
diff --git a/lib/02_parsing/stdlib/Base__Fn.pi b/lib/02_parsing/stdlib/Base_Fn.pi
similarity index 71%
rename from lib/02_parsing/stdlib/Base__Fn.pi
rename to lib/02_parsing/stdlib/Base_Fn.pi
index b463413..c7f6857 100644
--- a/lib/02_parsing/stdlib/Base__Fn.pi
+++ b/lib/02_parsing/stdlib/Base_Fn.pi
@@ -1,4 +1,4 @@
-library Base__Fn {
+library Base_Fn {
   let default = fn (value, default) -> {
     if (!value) {
       default
@@ -7,5 +7,5 @@ library Base__Fn {
     }
   };
 
-  let id = fn x -> x;
-}
\ No newline at end of file
+  let id = fn (x) -> x;
+}
diff --git a/lib/02_parsing/stdlib/Base__Math.pi b/lib/02_parsing/stdlib/Base_Math.pi
similarity index 52%
rename from lib/02_parsing/stdlib/Base__Math.pi
rename to lib/02_parsing/stdlib/Base_Math.pi
index 8580ba2..6b9594b 100644
--- a/lib/02_parsing/stdlib/Base__Math.pi
+++ b/lib/02_parsing/stdlib/Base_Math.pi
@@ -1,5 +1,5 @@
-library Base__Math {
-  let floor = fn n -> {
+library Base_Math {
+  let floor = fn (n) -> {
     let mod = n % 1;
     if (mod >= 0) {
       n - mod
@@ -8,5 +8,5 @@ library Base__Math {
     }
   };
 
-  let ceil = fn n -> -(Base.Math.floor(-n));
-}
\ No newline at end of file
+  let ceil = fn (n) -> -(floor(-n));
+}
diff --git a/lib/02_parsing/stdlib/Base__String.pi b/lib/02_parsing/stdlib/Base_String.pi
similarity index 84%
rename from lib/02_parsing/stdlib/Base__String.pi
rename to lib/02_parsing/stdlib/Base_String.pi
index c83b7a4..2fc50d1 100644
--- a/lib/02_parsing/stdlib/Base__String.pi
+++ b/lib/02_parsing/stdlib/Base_String.pi
@@ -1,4 +1,4 @@
-library Base__String {
+library Base_String {
   let length = fn (string) -> %%pinc_string_length%%;
 
   let map = fn (string, f) -> {
@@ -58,27 +58,21 @@ library Base__String {
   };
 
   let uppercase_ascii = fn (string) -> {
-    map(string, fn (c) -> {
-      if (c >= 'a' && c <= 'z') c - 32 else c
-    })
+    map(string, fn (c) -> { if (c >= 'a' && c <= 'z') c - 32 else c })
   };
 
   let lowercase_ascii = fn (string) -> {
-    map(string, fn (c) -> {
-      if (c >= 'A' && c <= 'Z') c + 32 else c
-    })
+    map(string, fn (c) -> { if (c >= 'A' && c <= 'Z') c + 32 else c })
   };
 
   let capitalize_ascii = fn (string) -> {
-    mapi(string, fn (index, c) -> {
-      if (index == 0 && c >= 'a' && c <= 'z') c - 32 else c
-    })
+    mapi(string, fn (index, c) -> { if (index == 0 && c >= 'a' && c <= 'z') c - 32 else c })
   };
 
   let nl2br = fn (string) -> {
     let mutable result = "";
     for (char in string) {
-      if (Base.Char.is_newline(char)) {
+      if (Base_Char.is_newline(char)) {
         result := result ++ "<br>";
       } else {
         result := result ++ char;
@@ -92,7 +86,7 @@ library Base__String {
     let mutable i = 0;
     let mutable j = len - 1;
     for (char in string) {
-      if (Base.Char.is_whitespace(char)) {
+      if (Base_Char.is_whitespace(char)) {
         i := i + 1;
       } else {
         break;
@@ -100,7 +94,7 @@ library Base__String {
     };
 
     for (char in reverse string) {
-      if (Base.Char.is_whitespace(char)) {
+      if (Base_Char.is_whitespace(char)) {
         j := j - 1;
       } else {
         break;
@@ -129,4 +123,4 @@ library Base__String {
 
     [sub(string, 0, j)] @@ result
   };
-}
\ No newline at end of file
+}
diff --git a/lib/pinc_backend/Interpreter.ml b/lib/pinc_backend/Interpreter.ml
index 631f00a..6fd1076 100644
--- a/lib/pinc_backend/Interpreter.ml
+++ b/lib/pinc_backend/Interpreter.ml
@@ -85,7 +85,6 @@ and eval_statement ~state statement =
       eval_let ~state ~ident ~is_mutable:true ~is_optional:false expression
   | Ast.MutationStatement (Lowercase_Id ident, expression) ->
       eval_mutation ~state ~ident expression
-  | Ast.UseStatement (ident, expression) -> eval_use ~state ~ident expression
   | Ast.BreakStatement _ -> raise_notrace (Loop_Break state)
   | Ast.ContinueStatement _ -> raise_notrace (Loop_Continue state)
   | Ast.ExpressionStatement expression -> expression |> eval_expression ~state
@@ -159,54 +158,6 @@ and eval_expression ~state expression =
         body
   | Ast.FunctionCall { function_definition; arguments } ->
       eval_function_call ~state ~arguments function_definition
-  | Ast.UppercaseIdentifierPathExpression path -> (
-      let rec eval_library_path ~state (name, library) path =
-        match path with
-        | [] -> (state, name, library)
-        | hd :: tl -> (
-            match library |> Type_Library.get_include hd with
-            | Some l -> eval_library_path ~state (hd, l) tl
-            | None ->
-                Diagnostics.raise_error
-                  expression.expression_loc
-                  (Printf.sprintf
-                     "Library with name `%s` could not be found inside `%s`."
-                     hd
-                     name))
-      in
-      match path with
-      | [] -> assert false
-      | hd :: tl -> (
-          let state, library =
-            state
-            |> State.get_used_values
-            |> StringMap.find_opt hd
-            |> Option.fold
-                 ~some:(fun l -> (state, Some (Definition_Library l)))
-                 ~none:(get_uppercase_identifier_typ ~state hd)
-          in
-          match library with
-          | Some (Definition_Library l) ->
-              let state, name, library = eval_library_path ~state (hd, l) tl in
-              let output =
-                {
-                  value_loc = expression.expression_loc;
-                  value_desc =
-                    DefinitionInfo (name, Some (Definition_Library library), `NotNegated);
-                }
-              in
-              state |> State.add_output ~output
-          | Some _ ->
-              Diagnostics.raise_error
-                expression.expression_loc
-                (Printf.sprintf
-                   "`%s` is not a library. Cannot construct a path with non library \
-                    definitions."
-                   hd)
-          | None ->
-              Diagnostics.raise_error
-                expression.expression_loc
-                (Printf.sprintf "Library with name `%s` could not be found." hd)))
   | Ast.UppercaseIdentifierExpression id ->
       let state, typ =
         state
@@ -1000,32 +951,6 @@ and eval_let ~state ~ident ~is_mutable ~is_optional expression =
       |> State.add_value_to_scope ~ident ~value ~is_mutable ~is_optional
       |> State.add_output ~output:(Helpers.Value.null ~loc:expression.expression_loc ())
 
-and eval_use ~state ~ident expression =
-  let value = expression |> eval_expression ~state |> State.get_output in
-  match value with
-  | { value_desc = DefinitionInfo (_, Some (Definition_Library library), _); _ } -> (
-      match ident with
-      | Some (Uppercase_Id ident) ->
-          let ident, _ident_location = ident in
-          state |> State.add_value_to_use_scope ~ident ~value:library
-      | None ->
-          let state =
-            StringMap.fold
-              (fun ident { is_optional; value; _ } ->
-                State.add_value_to_scope ~ident ~is_mutable:false ~is_optional ~value)
-              (Type_Library.get_bindings library)
-              state
-          in
-          StringMap.fold
-            (fun ident value -> State.add_value_to_use_scope ~ident ~value)
-            (Type_Library.get_includes library)
-            state)
-  | _ ->
-      Diagnostics.raise_error
-        expression.expression_loc
-        "Attempted to use a non library definition. \n\
-         Expected to see a Library at the right hand side of the `use` statement."
-
 and eval_mutation ~state ~ident expression =
   let ident, ident_location = ident in
   let current_binding = State.get_value_from_scope ~ident state in
diff --git a/lib/pinc_format/Formatter.ml b/lib/pinc_format/Formatter.ml
index cbc71c7..80ad637 100644
--- a/lib/pinc_format/Formatter.ml
+++ b/lib/pinc_format/Formatter.ml
@@ -187,9 +187,6 @@ and format_function_call function_definition arguments =
   in
   format_expression function_definition ^^ parens arguments
 
-and format_uppercase_id_path_expression path =
-  separate_map dot format_uppercase_id_expression path
-
 and format_uppercase_id_expression id = string id
 and format_lowercase_id_expression id = string id
 
@@ -432,7 +429,6 @@ and format_expression (exression : Parsetree.expression) =
     | P_Function { parameters; body } -> format_function parameters body
     | P_FunctionCall { function_definition; arguments } ->
         format_function_call function_definition arguments
-    | P_UppercaseIdentifierPathExpression path -> format_uppercase_id_path_expression path
     | P_UppercaseIdentifierExpression id -> format_uppercase_id_expression id
     | P_LowercaseIdentifierExpression id -> format_lowercase_id_expression id
     | P_TagExpression { tag_desc; tag_loc = _ } -> format_tag tag_desc
@@ -470,14 +466,6 @@ and format_continue_stmt i =
   in
   string "continue" ^^ num
 
-and format_use_stmt id expr =
-  string "use"
-  ^^ space
-  ^^ (match id with
-    | None -> empty
-    | Some id -> format_uppercase_id id ^^ space ^^ equals ^^ space)
-  ^^ format_expression expr
-
 and format_optional_mutable_let id expr =
   string "let"
   ^^ space
@@ -531,7 +519,6 @@ and format_statement ~last (statement : Parsetree.statement) =
     match statement.statement_desc with
     | P_BreakStatement s -> format_break_stmt s ^^ semi
     | P_ContinueStatement s -> format_continue_stmt s ^^ semi
-    | P_UseStatement (id, expr) -> format_use_stmt id expr ^^ semi
     | P_OptionalMutableLetStatement (id, expr) ->
         format_optional_mutable_let id expr ^^ semi
     | P_OptionalLetStatement (id, expr) -> format_optional_let id expr ^^ semi
diff --git a/test/array/data.pi b/test/array/data.pi
index c4ba057..f8917ae 100644
--- a/test/array/data.pi
+++ b/test/array/data.pi
@@ -1,6 +1,4 @@
 component C {
-  use Base;
-
   let array = 0...3;
   let new_array = array <- 4;
   let new_array_2 = array <- 4 <- 5 <- 6;
@@ -14,7 +12,7 @@ component C {
   let nested_array = new_array <- (merged_array <- merged_record_2);
   let index = 8;
 
-  let partitioned = merged_array_2 |> Array.partition(fn (item) -> {item % 2 == 0});
+  let partitioned = merged_array_2 |> Base_Array.partition(fn (item) -> {item % 2 == 0});
   let even = partitioned[0];
   let odd = partitioned[1];
 
@@ -39,43 +37,43 @@ component C {
 
     {odd}
 
-    {merged_array_2 |> Array.keep(fn (item) -> {item % 2 == 0})}
+    {merged_array_2 |> Base_Array.keep(fn (item) -> {item % 2 == 0})}
     
-    {if (merged_array_2 |> Array.find(fn (item) -> {item == 3})) {
+    {if (merged_array_2 |> Base_Array.find(fn (item) -> {item == 3})) {
       "FOUND"
     } else {
       "NOT FOUND"
     }}
 
-    {if merged_array_2 |> Array.find(fn (item) -> {item == -10}) {
+    {if merged_array_2 |> Base_Array.find(fn (item) -> {item == -10}) {
       "FOUND"
     } else {
       "NOT FOUND"
     }}
 
-    {even |> Array.every(fn (item) -> {item % 2 == 0})}
-    {merged_array_2 |> Array.some(fn (item) -> {item % 2 == 0})}
-    {merged_array_2 |> Array.every(fn (item) -> {item % 2 == 0})}
-    {merged_array_2 |> Array.some(fn (item) -> {item < 0})}
+    {even |> Base_Array.every(fn (item) -> {item % 2 == 0})}
+    {merged_array_2 |> Base_Array.some(fn (item) -> {item % 2 == 0})}
+    {merged_array_2 |> Base_Array.every(fn (item) -> {item % 2 == 0})}
+    {merged_array_2 |> Base_Array.some(fn (item) -> {item < 0})}
     {
-      Array.make(6)
-      |> Array.map(fn (item) -> item + 1)
-      |> Array.reduce(0, fn (acc, item) -> item + acc)
+      Base_Array.make(6)
+      |> Base_Array.map(fn (item) -> item + 1)
+      |> Base_Array.reduce(0, fn (acc, item) -> item + acc)
     }
 
-    {merged_array_2 |> Array.take_until(fn item -> item == 5)}
+    {merged_array_2 |> Base_Array.take_until(fn item -> item == 5)}
 
-    {1...10 |> Array.slice(2, 5)}
+    {1...10 |> Base_Array.slice(2, 5)}
 
     {
       ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10"]
-      |> Array.chunk(3)
-      |> Array.map(fn chunk -> Array.join(chunk, ","))
-      |> Array.map(fn item -> <div> {item} </div>)
+      |> Base_Array.chunk(3)
+      |> Base_Array.map(fn chunk -> Base_Array.join(chunk, ","))
+      |> Base_Array.map(fn item -> <div> {item} </div>)
     }
 
-    {[5, 1, 2, 3, 6, 3, 4, 7] |> Array.sort(fn (a, b) -> a - b)}
+    {[5, 1, 2, 3, 6, 3, 4, 7] |> Base_Array.sort(fn (a, b) -> a - b)}
     
-    {[1, 1, 2, 3, 4, 3, 4, 7] |> Array.unique}
+    {[1, 1, 2, 3, 4, 3, 4, 7] |> Base_Array.unique}
   </section>
 }
diff --git a/test/array/run.t b/test/array/run.t
index d75ccf7..8b8e488 100644
--- a/test/array/run.t
+++ b/test/array/run.t
@@ -45,8 +45,6 @@
 
   $ pincfmt ./data.pi
   component C {
-    use Base;
-  
     let array = 0...3;
     let new_array = array <- 4;
     let new_array_2 = array <- 4 <- 5 <- 6;
@@ -73,7 +71,7 @@
     let index = 8;
   
     let partitioned = merged_array_2
-      |> Array.partition(fn (item) -> { item % 2 == 0 });
+      |> Base_Array.partition(fn (item) -> { item % 2 == 0 });
     let even = partitioned[0];
     let odd = partitioned[1];
   
@@ -98,42 +96,48 @@
   
       {odd}
   
-      {merged_array_2 |> Array.keep(fn (item) -> { item % 2 == 0 })}
+      {merged_array_2 |> Base_Array.keep(fn (item) -> { item % 2 == 0 })}
   
-      {if (merged_array_2 |> Array.find(fn (item) -> { item == 3 })) { "FOUND" } else { "NOT FOUND" }}
+      {
+        if (merged_array_2 |> Base_Array.find(fn (item) -> { item == 3 })) {
+          "FOUND"
+        } else {
+          "NOT FOUND"
+        }
+      }
   
       {
-        if (merged_array_2 |> Array.find(fn (item) -> { item == -10 })) {
+        if (merged_array_2 |> Base_Array.find(fn (item) -> { item == -10 })) {
           "FOUND"
         } else {
           "NOT FOUND"
         }
       }
   
-      {even |> Array.every(fn (item) -> { item % 2 == 0 })}
-      {merged_array_2 |> Array.some(fn (item) -> { item % 2 == 0 })}
-      {merged_array_2 |> Array.every(fn (item) -> { item % 2 == 0 })}
-      {merged_array_2 |> Array.some(fn (item) -> { item < 0 })}
+      {even |> Base_Array.every(fn (item) -> { item % 2 == 0 })}
+      {merged_array_2 |> Base_Array.some(fn (item) -> { item % 2 == 0 })}
+      {merged_array_2 |> Base_Array.every(fn (item) -> { item % 2 == 0 })}
+      {merged_array_2 |> Base_Array.some(fn (item) -> { item < 0 })}
       {
-        Array.make(6)
-          |> Array.map(fn (item) -> item + 1)
-          |> Array.reduce(0, fn (acc, item) -> item + acc)
+        Base_Array.make(6)
+          |> Base_Array.map(fn (item) -> item + 1)
+          |> Base_Array.reduce(0, fn (acc, item) -> item + acc)
       }
   
-      {merged_array_2 |> Array.take_until(fn (item) -> item == 5)}
+      {merged_array_2 |> Base_Array.take_until(fn (item) -> item == 5)}
   
-      {1...10 |> Array.slice(2, 5)}
+      {1...10 |> Base_Array.slice(2, 5)}
   
       {
         ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10"]
-          |> Array.chunk(3)
-          |> Array.map(fn (chunk) -> Array.join(chunk, ","))
-          |> Array.map(fn (item) -> <div> {item} </div>)
+          |> Base_Array.chunk(3)
+          |> Base_Array.map(fn (chunk) -> Base_Array.join(chunk, ","))
+          |> Base_Array.map(fn (item) -> <div> {item} </div>)
       }
   
-      {[5, 1, 2, 3, 6, 3, 4, 7] |> Array.sort(fn (a, b) -> a - b)}
+      {[5, 1, 2, 3, 6, 3, 4, 7] |> Base_Array.sort(fn (a, b) -> a - b)}
   
-      {[1, 1, 2, 3, 4, 3, 4, 7] |> Array.unique}
+      {[1, 1, 2, 3, 4, 3, 4, 7] |> Base_Array.unique}
     </section>
   }
   
diff --git a/test/char/data.pi b/test/char/data.pi
index 97d7852..3ab830b 100644
--- a/test/char/data.pi
+++ b/test/char/data.pi
@@ -1,13 +1,11 @@
 component C {
-  use Base;
-
   let char = 'c';
 
   <section>
-    String.uppercase_ascii("abcàäöüß"): {String.uppercase_ascii("abcàäöüß")}
-    String.lowercase_ascii("ABCÁÄÖÜß"): {String.lowercase_ascii("ABCÁÄÖÜß")}
-    String.capitalize_ascii("abc"): {String.capitalize_ascii("abc")}
-    String.capitalize_ascii("äöü"): {String.capitalize_ascii("äöü")}
+    Base_String.uppercase_ascii("abcàäöüß"): {Base_String.uppercase_ascii("abcàäöüß")}
+    Base_String.lowercase_ascii("ABCÁÄÖÜß"): {Base_String.lowercase_ascii("ABCÁÄÖÜß")}
+    Base_String.capitalize_ascii("abc"): {Base_String.capitalize_ascii("abc")}
+    Base_String.capitalize_ascii("äöü"): {Base_String.capitalize_ascii("äöü")}
 
     char: {char}
     char + 1: {char + 1}
diff --git a/test/char/run.t b/test/char/run.t
index 03ec6d5..b60e9e4 100644
--- a/test/char/run.t
+++ b/test/char/run.t
@@ -1,9 +1,9 @@
   $ NO_COLOR="1" print . C
   <section>
-  String.uppercase_ascii("abcàäöüß"): ABCàäöüß
-  String.lowercase_ascii("ABCÁÄÖÜß"): abcÁÄÖÜß
-  String.capitalize_ascii("abc"): Abc
-  String.capitalize_ascii("äöü"): äöü
+  Base_String.uppercase_ascii("abcàäöüß"): ABCàäöüß
+  Base_String.lowercase_ascii("ABCÁÄÖÜß"): abcÁÄÖÜß
+  Base_String.capitalize_ascii("abc"): Abc
+  Base_String.capitalize_ascii("äöü"): äöü
   
   char: c
   char + 1: d
@@ -24,15 +24,13 @@
 
   $ pincfmt ./data.pi
   component C {
-    use Base;
-  
     let char = 'c';
   
     <section>
-      String.uppercase_ascii("abcàäöüß"): {String.uppercase_ascii("abcàäöüß")}
-      String.lowercase_ascii("ABCÁÄÖÜß"): {String.lowercase_ascii("ABCÁÄÖÜß")}
-      String.capitalize_ascii("abc"): {String.capitalize_ascii("abc")}
-      String.capitalize_ascii("äöü"): {String.capitalize_ascii("äöü")}
+      Base_String.uppercase_ascii("abcàäöüß"): {Base_String.uppercase_ascii("abcàäöüß")}
+      Base_String.lowercase_ascii("ABCÁÄÖÜß"): {Base_String.lowercase_ascii("ABCÁÄÖÜß")}
+      Base_String.capitalize_ascii("abc"): {Base_String.capitalize_ascii("abc")}
+      Base_String.capitalize_ascii("äöü"): {Base_String.capitalize_ascii("äöü")}
   
       char: {char}
       char + 1: {char + 1}
diff --git a/test/component/Sub/SubComponent.pi b/test/component/Sub/SubComponent.pi
index 5b44f8e..c689ee8 100644
--- a/test/component/Sub/SubComponent.pi
+++ b/test/component/Sub/SubComponent.pi
@@ -1,7 +1,13 @@
+component Subheadline {
+  let text = #String;
+
+  <span>{text}</span>
+}
+
 component HeadlineSecondary {
   let class? = #String;
 
-  let tag? = #String :: fn (value) -> value |> Base.Fn.default("h3");
+  let tag? = #String :: fn (value) -> value |> Base_Fn.default("h3");
 
   let data = #Record(of: {
     text: if (tag == "h2") #String else "No no no ... make h2 when you want text",
diff --git a/test/component/run.t b/test/component/run.t
index b365420..edc0420 100644
--- a/test/component/run.t
+++ b/test/component/run.t
@@ -74,11 +74,17 @@
   
 
   $ pincfmt ./Sub/SubComponent.pi
+  component Subheadline {
+    let text = #String;
+  
+    <span>{text}</span>
+  }
+  
   component HeadlineSecondary {
     let class? = #String;
   
     let tag? = #String :: fn (value) -> value
-      |> Base.Fn.default("h3");
+      |> Base_Fn.default("h3");
   
     let data = #Record(
       of: {
diff --git a/test/format/data.pi b/test/format/data.pi
index f96fd99..ed2ec6b 100644
--- a/test/format/data.pi
+++ b/test/format/data.pi
@@ -2,8 +2,6 @@
   Some Comment Eiusmod eiusmod tempor eiusmod nostrud nostrud nostrud in nisi ipsum ullamco ipsum esse enim laborum cupidatat. Deserunt duis culpa consectetur est duis.
 */
 page Docs(label: "Docs", icon: "/images/icons/page-docs.svg") {
-  use Math = Base.Math;
-
   /* Another comment! */
   let fruits = ["apples", "oranges", "bannanas", "melons"];
 
@@ -69,7 +67,7 @@ component Component(
         value: "h6",
       },
     ],
-  ) :: fn (v) -> Base.Fn.default(v, "h1");
+  ) :: fn (v) -> Base_Fn.default(v, "h1");
 
   let tags = #Array(label: "Tags", initialSize: 1, max: 5, of: #String(label: "Tag"));
 
diff --git a/test/format/run.t b/test/format/run.t
index 3fefaed..639bd60 100644
--- a/test/format/run.t
+++ b/test/format/run.t
@@ -3,8 +3,6 @@
     Some Comment Eiusmod eiusmod tempor eiusmod nostrud nostrud nostrud in nisi ipsum ullamco ipsum esse enim laborum cupidatat. Deserunt duis culpa consectetur est duis.
   */
   page Docs(label: "Docs", icon: "/images/icons/page-docs.svg") {
-    use Math = Base.Math;
-  
     /* Another comment! */
     let fruits = ["apples", "oranges", "bannanas", "melons"];
   
@@ -70,7 +68,7 @@
           value: "h6",
         },
       ],
-    ) :: fn (v) -> Base.Fn.default(v, "h1");
+    ) :: fn (v) -> Base_Fn.default(v, "h1");
   
     let tags = #Array(label: "Tags", initialSize: 1, max: 5, of: #String(label: "Tag"));
   
diff --git a/test/function/data.pi b/test/function/data.pi
index b476b19..9e35281 100644
--- a/test/function/data.pi
+++ b/test/function/data.pi
@@ -1,6 +1,4 @@
 component Component {
-  use C = Math.Constants;
-
   let max = fn (a, b) -> {
     if (a > b) {
       a
@@ -61,8 +59,7 @@ component Component {
     1 |> add_curry(5)() = {1 |> add_curry(5)()}
     5 |> Math.factorial = {5 |> Math.factorial}
 
-    Math.Constants.pi = {Math.Constants.pi}
-    C.pi = {C.pi}
+    Math__Constants.pi = {Math__Constants.pi}
 
     Map:
     {map(1...10, fn (item) -> item ** 2)}
diff --git a/test/function/library.pi b/test/function/library.pi
index 3de1df0..20c9a99 100644
--- a/test/function/library.pi
+++ b/test/function/library.pi
@@ -1,6 +1,4 @@
 library Math {
-  use Constants = Math__Constants;
-
   let fibonacci = fn (n) -> {
       if (n <= 1) {
         n
diff --git a/test/function/run.t b/test/function/run.t
index 5a86442..01bca54 100644
--- a/test/function/run.t
+++ b/test/function/run.t
@@ -12,8 +12,7 @@
   1 |> add_curry(5)() = 6
   5 |> Math.factorial = 120
   
-  Math.Constants.pi = 3.1415
-  C.pi = 3.1415
+  Math__Constants.pi = 3.1415
   
   Map:
   14916
@@ -24,8 +23,6 @@
 
   $ pincfmt ./data.pi
   component Component {
-    use C = Math.Constants;
-  
     let max = fn (a, b) -> {
       if (a > b) {
         a
@@ -88,8 +85,7 @@
       1 |> add_curry(5)() = {1 |> add_curry(5)()}
       5 |> Math.factorial = {5 |> Math.factorial}
   
-      Math.Constants.pi = {Math.Constants.pi}
-      C.pi = {C.pi}
+      Math__Constants.pi = {Math__Constants.pi}
   
       Map:
       {map(1...10, fn (item) -> item ** 2)}
@@ -102,8 +98,6 @@
 
   $ pincfmt ./library.pi
   library Math {
-    use Constants = Math__Constants;
-  
     let fibonacci = fn (n) -> {
       if (n <= 1) {
         n
diff --git a/test/interpreter_error/run.t b/test/interpreter_error/run.t
index 84a9118..a4dad26 100644
--- a/test/interpreter_error/run.t
+++ b/test/interpreter_error/run.t
@@ -5,25 +5,12 @@
   Declaration with name `NotExistingDefinition` was not found.
   [1]
 
-  $ NO_COLOR="1" print . UseNonLibrary
-  
-  ERROR in file ./use_non_library.pi:2:7-18
-  
-     1 │ component UseNonLibrary {
-     2 │   use NotALibrary;
-       │       ^^^^^^^^^^^ 
-     3 │ }
-  
-  Attempted to use a non library definition. 
-  Expected to see a Library at the right hand side of the `use` statement.
-  [1]
-
   $ NO_COLOR="1" print . BadTransformer_Arity
   
   ERROR in file ./tag_transformer_arity.pi:6:25-37
   
      5 │ component BadTransformer_Arity_Child {
-     6 │   let text = #String :: fn (a, b) -> Base.String.uppercase(a);
+     6 │   let text = #String :: fn (a, b) -> Base_String.uppercase(a);
        │                         ^^^^^^^^^^^^                          
      7 │ 
   
diff --git a/test/interpreter_error/tag_transformer_arity.pi b/test/interpreter_error/tag_transformer_arity.pi
index 2fb07d3..2b2cccb 100644
--- a/test/interpreter_error/tag_transformer_arity.pi
+++ b/test/interpreter_error/tag_transformer_arity.pi
@@ -3,7 +3,7 @@ component BadTransformer_Arity {
 }
 
 component BadTransformer_Arity_Child {
-  let text = #String :: fn (a, b) -> Base.String.uppercase(a);
+  let text = #String :: fn (a, b) -> Base_String.uppercase(a);
 
   text
 }
diff --git a/test/interpreter_error/use_non_library.pi b/test/interpreter_error/use_non_library.pi
deleted file mode 100644
index 283a930..0000000
--- a/test/interpreter_error/use_non_library.pi
+++ /dev/null
@@ -1,3 +0,0 @@
-component UseNonLibrary {
-  use NotALibrary;
-}
\ No newline at end of file
diff --git a/test/portal/main.pi b/test/portal/main.pi
index 8f11d10..6011da9 100644
--- a/test/portal/main.pi
+++ b/test/portal/main.pi
@@ -13,7 +13,7 @@ component Main {
 }
 
 component Head {
-  let stylesheets = #CreatePortal :: Base.Array.unique;
+  let stylesheets = #CreatePortal :: Base_Array.unique;
 
   <head>
     {stylesheets}
diff --git a/test/portal/run.t b/test/portal/run.t
index be685dc..f8d87df 100644
--- a/test/portal/run.t
+++ b/test/portal/run.t
@@ -24,7 +24,7 @@
   }
   
   component Head {
-    let stylesheets = #CreatePortal :: Base.Array.unique;
+    let stylesheets = #CreatePortal :: Base_Array.unique;
   
     <head>
       {stylesheets}
diff --git a/test/slot/SubComponent.pi b/test/slot/SubComponent.pi
index a56db0d..d01a2dc 100644
--- a/test/slot/SubComponent.pi
+++ b/test/slot/SubComponent.pi
@@ -19,7 +19,7 @@ component SubComponent {
   <div class="SubComponent" data-foo={num}>
     {content}
 
-    {array_things |> Base.Array.map(fn r -> r.i)}
+    {array_things |> Base_Array.map(fn r -> r.i)}
 
     {record.a}
     {record.b}
diff --git a/test/slot/run.t b/test/slot/run.t
index fac60cd..d40f403 100644
--- a/test/slot/run.t
+++ b/test/slot/run.t
@@ -129,7 +129,7 @@
     <div class="SubComponent" data-foo={num}>
       {content}
   
-      {array_things |> Base.Array.map(fn (r) -> r.i)}
+      {array_things |> Base_Array.map(fn (r) -> r.i)}
   
       {record.a}
       {record.b}