diff --git a/.gitignore b/.gitignore
index 93d52be..e1070fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,43 +1,9 @@
-# Object files
-*.o
-*.ko
-*.obj
-*.elf
-
-# Precompiled Headers
-*.gch
-*.pch
-
-# Libraries
-*.lib
-*.a
-*.la
-*.lo
-
-# Shared objects (inc. Windows DLLs)
-*.dll
-*.so
-*.so.*
-*.dylib
-
-# Executables
-*.exe
-*.out
-*.app
-*.i*86
-*.x86_64
-
-# Debug files
-*.dSYM/
-
-*.err
-*.d
-
-private.xml
-uLI.X/nbproject/*.mk
-uLI.X/nbproject/*.properties
-uLI.X/nbproject/*.bash
-uLI.X/nbproject/private
-uLI.X/build
-uLI.X/dist
-uLI.X/debug
\ No newline at end of file
+nbproject/*.mk
+nbproject/*.properties
+nbproject/*.bash
+nbproject/private
+build
+dist
+debug
+
+*.swp
diff --git a/uLI.X/Makefile b/Makefile
similarity index 100%
rename from uLI.X/Makefile
rename to Makefile
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
new file mode 100644
index 0000000..8c3b410
--- /dev/null
+++ b/nbproject/configurations.xml
@@ -0,0 +1,638 @@
+
+
+
+
+
+ usb_stack/usb.h
+ usb_stack/usb_ch9.h
+ usb_stack/usb_common.h
+ usb_stack/usb_config.h
+ usb_stack/usb_device.h
+ usb_stack/usb_device_cdc.h
+ usb_stack/usb_device_local.h
+ usb_stack/usb_hal.h
+ usb_stack/usb_hal_pic18.h
+
+ Compiler.h
+ GenericTypeDefs.h
+ HardwareProfile.h
+ eeprom.h
+ main.h
+ ringBuffer.h
+ usart.h
+
+
+ rm18F14K50.lkr
+
+
+
+ usb_stack/usb_descriptors.c
+ usb_stack/usb_device.c
+ usb_stack/usb_device_cdc.c
+
+ eeprom.c
+ main.c
+ ringBuffer.c
+ usart.c
+
+
+ Makefile
+
+
+
+ ..
+
+ Makefile
+
+
+
+ localhost
+ PIC18F14K50
+
+
+ Simulator
+ XC8
+ 2.10
+ 2
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ true
+
+
+
+
+
+
+ false
+
+ false
+
+ false
+ false
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/uLI.X/nbproject/project.xml b/nbproject/project.xml
similarity index 62%
rename from uLI.X/nbproject/project.xml
rename to nbproject/project.xml
index 0a7e3e8..16ba11d 100644
--- a/uLI.X/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -12,6 +12,18 @@
UTF-8
+
+ ..
+
+
+
+ default
+ 2
+
+
+
+ false
+
diff --git a/uLI.X/nbproject/configurations.xml b/uLI.X/nbproject/configurations.xml
deleted file mode 100644
index 107ba15..0000000
--- a/uLI.X/nbproject/configurations.xml
+++ /dev/null
@@ -1,377 +0,0 @@
-
-
-
-
-
- ../usb.h
- ../usb_ch9.h
- ../usb_hal.h
- ../usb_hal_pic18.h
- ../usb_common.h
- ../usb_device.h
-
- ../usb_config.h
- ../usb_function_cdc.h
- ../Compiler.h
- ../GenericTypeDefs.h
- ../HardwareProfile.h
- ../ringBuffer.h
- ../usart.h
- ../main.h
- ../eeprom.h
-
-
- ../rm18F14K50.lkr
-
-
-
- ../usb_function_cdc.c
- ../usb_device.c
-
- ../main.c
- ../usb_descriptors.c
- ../ringBuffer.c
- ../usart.c
- ../eeprom.c
-
-
- Makefile
-
-
-
- ..
-
- Makefile
-
-
-
- localhost
- PIC18F14K50
-
-
- Simulator
- C18
- 3.47
- 3
-
-
-
-
-
-
-
-
-
- false
- true
-
-
-
-
-
-
- false
-
- false
-
- false
- false
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-