diff --git a/Microcontrollers/Microcontrollers/opdracht 2.7a.cproj b/Microcontrollers/Microcontrollers/opdracht 2.7a.cproj
deleted file mode 100644
index 9c0f55c..0000000
--- a/Microcontrollers/Microcontrollers/opdracht 2.7a.cproj	
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectVersion>7.0</ProjectVersion>
-    <ToolchainName>com.microchip.xc8</ToolchainName>
-    <ProjectGuid>2285C48D-296E-43FD-A7B6-69885F64CFFD</ProjectGuid>
-    <avrdevice>ATmega128</avrdevice>
-    <avrdeviceseries>none</avrdeviceseries>
-    <OutputType>Executable</OutputType>
-    <Language>C</Language>
-    <OutputFileName>$(MSBuildProjectName)</OutputFileName>
-    <OutputFileExtension>.elf</OutputFileExtension>
-    <OutputDirectory>$(MSBuildProjectDirectory)\$(Configuration)</OutputDirectory>
-    <AssemblyName>opdracht 2.7a</AssemblyName>
-    <Name>opdracht 2.7a</Name>
-    <RootNamespace>opdracht 2.7a</RootNamespace>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <ToolchainSettings />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <ToolchainSettings />
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="main.c">
-      <SubType>compile</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(AVRSTUDIO_EXE_PATH)\\Vs\\Compiler.targets" />
-</Project>
\ No newline at end of file
diff --git a/Microcontrollers/Microcontrollers/main.c b/Microcontrollers/opdracht 1.4/main.c
similarity index 100%
rename from Microcontrollers/Microcontrollers/main.c
rename to Microcontrollers/opdracht 1.4/main.c
diff --git a/Microcontrollers/Microcontrollers/opdracht 1.4.componentinfo.xml b/Microcontrollers/opdracht 1.4/opdracht 1.4.componentinfo.xml
similarity index 100%
rename from Microcontrollers/Microcontrollers/opdracht 1.4.componentinfo.xml
rename to Microcontrollers/opdracht 1.4/opdracht 1.4.componentinfo.xml
diff --git a/Microcontrollers/Microcontrollers/opdracht 1.4.cproj b/Microcontrollers/opdracht 1.4/opdracht 1.4.cproj
similarity index 100%
rename from Microcontrollers/Microcontrollers/opdracht 1.4.cproj
rename to Microcontrollers/opdracht 1.4/opdracht 1.4.cproj
diff --git a/Microcontrollers/Microcontrollers/src/ASF/common/boards/board.h b/Microcontrollers/opdracht 1.4/src/ASF/common/boards/board.h
similarity index 100%
rename from Microcontrollers/Microcontrollers/src/ASF/common/boards/board.h
rename to Microcontrollers/opdracht 1.4/src/ASF/common/boards/board.h
diff --git a/Microcontrollers/Microcontrollers/src/ASF/common/utils/interrupt.h b/Microcontrollers/opdracht 1.4/src/ASF/common/utils/interrupt.h
similarity index 100%
rename from Microcontrollers/Microcontrollers/src/ASF/common/utils/interrupt.h
rename to Microcontrollers/opdracht 1.4/src/ASF/common/utils/interrupt.h
diff --git a/Microcontrollers/Microcontrollers/src/ASF/common/utils/interrupt/interrupt_avr8.h b/Microcontrollers/opdracht 1.4/src/ASF/common/utils/interrupt/interrupt_avr8.h
similarity index 100%
rename from Microcontrollers/Microcontrollers/src/ASF/common/utils/interrupt/interrupt_avr8.h
rename to Microcontrollers/opdracht 1.4/src/ASF/common/utils/interrupt/interrupt_avr8.h
diff --git a/Microcontrollers/Microcontrollers/src/ASF/common/utils/make/Makefile.avr.in b/Microcontrollers/opdracht 1.4/src/ASF/common/utils/make/Makefile.avr.in
similarity index 100%
rename from Microcontrollers/Microcontrollers/src/ASF/common/utils/make/Makefile.avr.in
rename to Microcontrollers/opdracht 1.4/src/ASF/common/utils/make/Makefile.avr.in
diff --git a/Microcontrollers/Microcontrollers/src/ASF/common/utils/parts.h b/Microcontrollers/opdracht 1.4/src/ASF/common/utils/parts.h
similarity index 100%
rename from Microcontrollers/Microcontrollers/src/ASF/common/utils/parts.h
rename to Microcontrollers/opdracht 1.4/src/ASF/common/utils/parts.h
diff --git a/Microcontrollers/Microcontrollers/src/ASF/mega/boards/stk600/rcx_x/init.c b/Microcontrollers/opdracht 1.4/src/ASF/mega/boards/stk600/rcx_x/init.c
similarity index 100%
rename from Microcontrollers/Microcontrollers/src/ASF/mega/boards/stk600/rcx_x/init.c
rename to Microcontrollers/opdracht 1.4/src/ASF/mega/boards/stk600/rcx_x/init.c
diff --git a/Microcontrollers/Microcontrollers/src/ASF/mega/utils/assembler.h b/Microcontrollers/opdracht 1.4/src/ASF/mega/utils/assembler.h
similarity index 100%
rename from Microcontrollers/Microcontrollers/src/ASF/mega/utils/assembler.h
rename to Microcontrollers/opdracht 1.4/src/ASF/mega/utils/assembler.h
diff --git a/Microcontrollers/Microcontrollers/src/ASF/mega/utils/assembler/gas.h b/Microcontrollers/opdracht 1.4/src/ASF/mega/utils/assembler/gas.h
similarity index 100%
rename from Microcontrollers/Microcontrollers/src/ASF/mega/utils/assembler/gas.h
rename to Microcontrollers/opdracht 1.4/src/ASF/mega/utils/assembler/gas.h
diff --git a/Microcontrollers/Microcontrollers/src/ASF/mega/utils/compiler.h b/Microcontrollers/opdracht 1.4/src/ASF/mega/utils/compiler.h
similarity index 100%
rename from Microcontrollers/Microcontrollers/src/ASF/mega/utils/compiler.h
rename to Microcontrollers/opdracht 1.4/src/ASF/mega/utils/compiler.h
diff --git a/Microcontrollers/Microcontrollers/src/ASF/mega/utils/preprocessor/mrepeat.h b/Microcontrollers/opdracht 1.4/src/ASF/mega/utils/preprocessor/mrepeat.h
similarity index 100%
rename from Microcontrollers/Microcontrollers/src/ASF/mega/utils/preprocessor/mrepeat.h
rename to Microcontrollers/opdracht 1.4/src/ASF/mega/utils/preprocessor/mrepeat.h
diff --git a/Microcontrollers/Microcontrollers/src/ASF/mega/utils/preprocessor/preprocessor.h b/Microcontrollers/opdracht 1.4/src/ASF/mega/utils/preprocessor/preprocessor.h
similarity index 100%
rename from Microcontrollers/Microcontrollers/src/ASF/mega/utils/preprocessor/preprocessor.h
rename to Microcontrollers/opdracht 1.4/src/ASF/mega/utils/preprocessor/preprocessor.h
diff --git a/Microcontrollers/Microcontrollers/src/ASF/mega/utils/preprocessor/stringz.h b/Microcontrollers/opdracht 1.4/src/ASF/mega/utils/preprocessor/stringz.h
similarity index 100%
rename from Microcontrollers/Microcontrollers/src/ASF/mega/utils/preprocessor/stringz.h
rename to Microcontrollers/opdracht 1.4/src/ASF/mega/utils/preprocessor/stringz.h
diff --git a/Microcontrollers/Microcontrollers/src/ASF/mega/utils/preprocessor/tpaste.h b/Microcontrollers/opdracht 1.4/src/ASF/mega/utils/preprocessor/tpaste.h
similarity index 100%
rename from Microcontrollers/Microcontrollers/src/ASF/mega/utils/preprocessor/tpaste.h
rename to Microcontrollers/opdracht 1.4/src/ASF/mega/utils/preprocessor/tpaste.h
diff --git a/Microcontrollers/Microcontrollers/src/ASF/mega/utils/progmem.h b/Microcontrollers/opdracht 1.4/src/ASF/mega/utils/progmem.h
similarity index 100%
rename from Microcontrollers/Microcontrollers/src/ASF/mega/utils/progmem.h
rename to Microcontrollers/opdracht 1.4/src/ASF/mega/utils/progmem.h
diff --git a/Microcontrollers/Microcontrollers/src/ASF/mega/utils/status_codes.h b/Microcontrollers/opdracht 1.4/src/ASF/mega/utils/status_codes.h
similarity index 100%
rename from Microcontrollers/Microcontrollers/src/ASF/mega/utils/status_codes.h
rename to Microcontrollers/opdracht 1.4/src/ASF/mega/utils/status_codes.h
diff --git a/Microcontrollers/Microcontrollers/src/asf.h b/Microcontrollers/opdracht 1.4/src/asf.h
similarity index 100%
rename from Microcontrollers/Microcontrollers/src/asf.h
rename to Microcontrollers/opdracht 1.4/src/asf.h
diff --git a/Microcontrollers/Microcontrollers/src/config/conf_board.h b/Microcontrollers/opdracht 1.4/src/config/conf_board.h
similarity index 100%
rename from Microcontrollers/Microcontrollers/src/config/conf_board.h
rename to Microcontrollers/opdracht 1.4/src/config/conf_board.h
diff --git a/Microcontrollers/Microcontrollers/src/main.c b/Microcontrollers/opdracht 1.4/src/main.c
similarity index 100%
rename from Microcontrollers/Microcontrollers/src/main.c
rename to Microcontrollers/opdracht 1.4/src/main.c
diff --git a/Microcontrollers/XC8Application1/main.c b/Microcontrollers/opdracht 1.5/main.c
similarity index 100%
rename from Microcontrollers/XC8Application1/main.c
rename to Microcontrollers/opdracht 1.5/main.c
diff --git a/Microcontrollers/XC8Application1/opdracht B.5.componentinfo.xml b/Microcontrollers/opdracht 1.5/opdracht B.5.componentinfo.xml
similarity index 100%
rename from Microcontrollers/XC8Application1/opdracht B.5.componentinfo.xml
rename to Microcontrollers/opdracht 1.5/opdracht B.5.componentinfo.xml
diff --git a/Microcontrollers/XC8Application1/opdracht B.5.cproj b/Microcontrollers/opdracht 1.5/opdracht B.5.cproj
similarity index 100%
rename from Microcontrollers/XC8Application1/opdracht B.5.cproj
rename to Microcontrollers/opdracht 1.5/opdracht B.5.cproj
diff --git a/Microcontrollers/opdracht 1.7a/opdracht 2.7a.componentinfo.xml b/Microcontrollers/opdracht 1.7a/opdracht 2.7a.componentinfo.xml
deleted file mode 100644
index bbcc667..0000000
--- a/Microcontrollers/opdracht 1.7a/opdracht 2.7a.componentinfo.xml	
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Store xmlns:i="http://www.w3.org/2001/XMLSchema-instance" xmlns="AtmelPackComponentManagement">
-	<ProjectComponents>
-		<ProjectComponent z:Id="i1" xmlns:z="http://schemas.microsoft.com/2003/10/Serialization/">
-			<CApiVersion></CApiVersion>
-			<CBundle></CBundle>
-			<CClass>Device</CClass>
-			<CGroup>Startup</CGroup>
-			<CSub></CSub>
-			<CVariant></CVariant>
-			<CVendor>Atmel</CVendor>
-			<CVersion>1.6.0</CVersion>
-			<DefaultRepoPath>C:/Program Files (x86)\Atmel\Studio\7.0\Packs</DefaultRepoPath>
-			<DependentComponents xmlns:d4p1="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
-			<Description></Description>
-			<Files xmlns:d4p1="http://schemas.microsoft.com/2003/10/Serialization/Arrays">
-				<d4p1:anyType i:type="FileInfo">
-					<AbsolutePath>C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.6.364\xc8\avr\include\avr\iom128.h</AbsolutePath>
-					<Attribute></Attribute>
-					<Category>header</Category>
-					<Condition>XC</Condition>
-					<FileContentHash>JdJ7J9I/SJh965SEyyyVYw==</FileContentHash>
-					<FileVersion></FileVersion>
-					<Name>xc8/avr/include/avr/iom128.h</Name>
-					<SelectString></SelectString>
-					<SourcePath></SourcePath>
-				</d4p1:anyType>
-			</Files>
-			<PackName>ATmega_DFP</PackName>
-			<PackPath>C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.6.364/Atmel.ATmega_DFP.pdsc</PackPath>
-			<PackVersion>1.6.364</PackVersion>
-			<PresentInProject>true</PresentInProject>
-			<ReferenceConditionId>ATmega128</ReferenceConditionId>
-			<RteComponents xmlns:d4p1="http://schemas.microsoft.com/2003/10/Serialization/Arrays">
-				<d4p1:string></d4p1:string>
-			</RteComponents>
-			<Status>Resolved</Status>
-			<VersionMode>Fixed</VersionMode>
-			<IsComponentInAtProject>true</IsComponentInAtProject>
-		</ProjectComponent>
-	</ProjectComponents>
-</Store>
\ No newline at end of file
diff --git a/Microcontrollers/opdracht 2.7a/main.c b/Microcontrollers/opdracht 2.7a/main.c
deleted file mode 100644
index eaea0e3..0000000
--- a/Microcontrollers/opdracht 2.7a/main.c	
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * main.c
- *
- * Created: 08-Feb-21 10:03:33 AM
- *  Author: lemms
- */ 
-# define F_CPU 10000000UL
-
-#include <util/delay.h>
-#include <xc.h>
-
-typedef enum {
-	IDLE,
-	PERPARE_COFFEE_POWDER,
-	BOIL_WATER,
-	POUR_COFFEE
-	} state ;
-	
-	typedef enum {
-		false = 0,
-		true = 1
-	} bool;
-
-state current_state;
-
-void wait( int ms )
-{
-	for (int i=0; i<ms; i++)
-	{
-		_delay_ms( 1 );		// library function (max 30 ms at 8MHz)
-	}
-}
-
-void setPulveriserState(bool state){
-	// set coffee powder mill on or off;
-}
-
-bool checkCoffeePowderLevel(){
-	// check sensor
-	return true;
-}
-
-void updateScreen(){
-	// update its display;
-	if(...){
-		current_state = PERPARE_COFFEE_POWDER;
-	}
-}
-
-void setBoilerState(bool state){
-	// set boiler on or off;
-}
-
-bool checkWaterTemp(){
-	// check sensor
-	return true;
-}
-
- long milisPouring;
- 
-void setPourPumpState(bool state){
-	// set pump on or off;
-}
-
-int main(void)
-{
-    while(1)
-    {
-        switch(state){
-			case IDLE:
-				updateScreen();
-			break;
-			
-			case PERPARE_COFFEE_POWDER:
-				bool coffeeLevel = checkCoffeePowderLevel();
-				setPulveriserState(!coffeeLevel);
-			
-				if(coffeeLevel){
-					current_state = BOIL_WATER;
-				}
-			break;
-			
-			case BOIL_WATER:
-				bool waterTemp = checkWaterTemp();
-				setBoilerState(!waterTemp);
-				if(waterTemp){
-					current_state = POUR_COFFEE;
-				}
-			break;
-			
-			case POUR_COFFEE:
-				bool shouldPour = !(milisPouring => 2000);
-				setPourPumpState(shouldPour);
-			
-				milisPouring++;
-			
-				if(!shouldPour){
-					milisPouring = 0;
-				}
-			break;
-		}
-		wait(1);
-    }
-}
\ No newline at end of file
diff --git a/Microcontrollers/opdracht 2.7a/opdracht 1.7a.componentinfo.xml b/Microcontrollers/opdracht 2.7a/opdracht 1.7a.componentinfo.xml
deleted file mode 100644
index bbcc667..0000000
--- a/Microcontrollers/opdracht 2.7a/opdracht 1.7a.componentinfo.xml	
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Store xmlns:i="http://www.w3.org/2001/XMLSchema-instance" xmlns="AtmelPackComponentManagement">
-	<ProjectComponents>
-		<ProjectComponent z:Id="i1" xmlns:z="http://schemas.microsoft.com/2003/10/Serialization/">
-			<CApiVersion></CApiVersion>
-			<CBundle></CBundle>
-			<CClass>Device</CClass>
-			<CGroup>Startup</CGroup>
-			<CSub></CSub>
-			<CVariant></CVariant>
-			<CVendor>Atmel</CVendor>
-			<CVersion>1.6.0</CVersion>
-			<DefaultRepoPath>C:/Program Files (x86)\Atmel\Studio\7.0\Packs</DefaultRepoPath>
-			<DependentComponents xmlns:d4p1="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
-			<Description></Description>
-			<Files xmlns:d4p1="http://schemas.microsoft.com/2003/10/Serialization/Arrays">
-				<d4p1:anyType i:type="FileInfo">
-					<AbsolutePath>C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.6.364\xc8\avr\include\avr\iom128.h</AbsolutePath>
-					<Attribute></Attribute>
-					<Category>header</Category>
-					<Condition>XC</Condition>
-					<FileContentHash>JdJ7J9I/SJh965SEyyyVYw==</FileContentHash>
-					<FileVersion></FileVersion>
-					<Name>xc8/avr/include/avr/iom128.h</Name>
-					<SelectString></SelectString>
-					<SourcePath></SourcePath>
-				</d4p1:anyType>
-			</Files>
-			<PackName>ATmega_DFP</PackName>
-			<PackPath>C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.6.364/Atmel.ATmega_DFP.pdsc</PackPath>
-			<PackVersion>1.6.364</PackVersion>
-			<PresentInProject>true</PresentInProject>
-			<ReferenceConditionId>ATmega128</ReferenceConditionId>
-			<RteComponents xmlns:d4p1="http://schemas.microsoft.com/2003/10/Serialization/Arrays">
-				<d4p1:string></d4p1:string>
-			</RteComponents>
-			<Status>Resolved</Status>
-			<VersionMode>Fixed</VersionMode>
-			<IsComponentInAtProject>true</IsComponentInAtProject>
-		</ProjectComponent>
-	</ProjectComponents>
-</Store>
\ No newline at end of file
diff --git a/Microcontrollers/opdracht 2.7a/opdracht 1.7a.cproj b/Microcontrollers/opdracht 2.7a/opdracht 1.7a.cproj
deleted file mode 100644
index 136fa52..0000000
--- a/Microcontrollers/opdracht 2.7a/opdracht 1.7a.cproj	
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectVersion>7.0</ProjectVersion>
-    <ToolchainName>com.microchip.xc8</ToolchainName>
-    <ProjectGuid>{b7ed8d27-9387-4a45-a238-923f89602fb5}</ProjectGuid>
-    <avrdevice>ATmega128</avrdevice>
-    <avrdeviceseries>none</avrdeviceseries>
-    <OutputType>Executable</OutputType>
-    <Language>C</Language>
-    <OutputFileName>$(MSBuildProjectName)</OutputFileName>
-    <OutputFileExtension>.elf</OutputFileExtension>
-    <OutputDirectory>$(MSBuildProjectDirectory)\$(Configuration)</OutputDirectory>
-    <AssemblyName>opdracht 2.7a</AssemblyName>
-    <Name>opdracht 1.7a</Name>
-    <RootNamespace>opdracht 2.7a</RootNamespace>
-    <ToolchainFlavour>XC8_2.31</ToolchainFlavour>
-    <KeepTimersRunning>true</KeepTimersRunning>
-    <OverrideVtor>false</OverrideVtor>
-    <CacheFlash>true</CacheFlash>
-    <ProgFlashFromRam>true</ProgFlashFromRam>
-    <RamSnippetAddress />
-    <UncachedRange />
-    <preserveEEPROM>true</preserveEEPROM>
-    <OverrideVtorValue />
-    <BootSegment>2</BootSegment>
-    <ResetRule>0</ResetRule>
-    <eraseonlaunchrule>0</eraseonlaunchrule>
-    <EraseKey />
-    <AsfFrameworkConfig>
-      <framework-data xmlns="">
-        <options />
-        <configurations />
-        <files />
-        <documentation help="" />
-        <offline-documentation help="" />
-        <dependencies>
-          <content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.49.1" />
-        </dependencies>
-      </framework-data>
-    </AsfFrameworkConfig>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <ToolchainSettings />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <ToolchainSettings />
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="main.c">
-      <SubType>compile</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(AVRSTUDIO_EXE_PATH)\\Vs\\Compiler.targets" />
-</Project>
\ No newline at end of file