diff --git a/arduino/libs/LiquidCrystal.cpp b/arduino/libs/LiquidCrystal/LiquidCrystal.cpp
similarity index 100%
rename from arduino/libs/LiquidCrystal.cpp
rename to arduino/libs/LiquidCrystal/LiquidCrystal.cpp
diff --git a/arduino/libs/LiquidCrystal.h b/arduino/libs/LiquidCrystal/LiquidCrystal.h
similarity index 68%
rename from arduino/libs/LiquidCrystal.h
rename to arduino/libs/LiquidCrystal/LiquidCrystal.h
index 5d7dcd2..da950ce 100644
--- a/arduino/libs/LiquidCrystal.h
+++ b/arduino/libs/LiquidCrystal/LiquidCrystal.h
@@ -1,34 +1,3 @@
-/* 
-CONTENTS OF LICENSE FILE (added by Jonas_Jones):
-
-      = Liquid Crystal Library for Arduino =
-
-      This library allows an Arduino board to control LiquidCrystal displays (LCDs) based on the Hitachi HD44780 (or a compatible) chipset, which is found on most text-based LCDs.
-
-      For more information about this library please visit us at
-      http://www.arduino.cc/en/Reference/LiquidCrystal
-
-      == License ==
-
-      Copyright (C) 2006-2008 Hans-Christoph Steiner. All rights reserved.
-      Copyright (c) 2010 Arduino LLC. All right reserved.
-
-      This library is free software; you can redistribute it and/or
-      modify it under the terms of the GNU Lesser General Public
-      License as published by the Free Software Foundation; either
-      version 2.1 of the License, or (at your option) any later version.
-
-      This library is distributed in the hope that it will be useful,
-      but WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-      Lesser General Public License for more details.
-
-      You should have received a copy of the GNU Lesser General Public
-      License along with this library; if not, write to the Free Software
-      Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-*/
-
 #ifndef LiquidCrystal_h
 #define LiquidCrystal_h
 
diff --git a/arduino/libs/SoftwareSerial.cpp b/arduino/libs/SoftwareSerial/SoftwareSerial.cpp
similarity index 100%
rename from arduino/libs/SoftwareSerial.cpp
rename to arduino/libs/SoftwareSerial/SoftwareSerial.cpp
diff --git a/arduino/libs/SoftwareSerial.h b/arduino/libs/SoftwareSerial/SoftwareSerial.h
similarity index 100%
rename from arduino/libs/SoftwareSerial.h
rename to arduino/libs/SoftwareSerial/SoftwareSerial.h