diff --git a/CMakeLists.txt b/CMakeLists.txt
index 28105dd..d10392b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,17 +1,35 @@
 cmake_minimum_required(VERSION 2.4.6)
 include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
 
-# Append to CPACK_SOURCE_IGNORE_FILES a semicolon-separated list of
-# directories (or patterns, but directories should suffice) that should
-# be excluded from the distro.  This is not the place to put things that
-# should be ignored everywhere, like "build" directories; that happens in
-# rosbuild/rosbuild.cmake.  Here should be listed packages that aren't
-# ready for inclusion in a distro.
-#
-# This list is combined with the list in rosbuild/rosbuild.cmake.  Note
-# that CMake 2.6 may be required to ensure that the two lists are combined
-# properly.  CMake 2.4 seems to have unpredictable scoping rules for such
-# variables.
-#list(APPEND CPACK_SOURCE_IGNORE_FILES /core/experimental)
+# Set the build type.  Options are:
+#  Coverage       : w/ debug symbols, w/o optimization, w/ code-coverage
+#  Debug          : w/ debug symbols, w/o optimization
+#  Release        : w/o debug symbols, w/ optimization
+#  RelWithDebInfo : w/ debug symbols, w/ optimization
+#  MinSizeRel     : w/o debug symbols, w/ optimization, stripped binaries
+#set(ROS_BUILD_TYPE RelWithDebInfo)
 
-rosbuild_make_distribution(0.1.0)
+rosbuild_init()
+
+#set the default path for built executables to the "bin" directory
+set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
+#set the default path for built libraries to the "lib" directory
+set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
+
+#uncomment if you have defined messages
+#rosbuild_genmsg()
+#uncomment if you have defined services
+#rosbuild_gensrv()
+
+#common commands for building c++ executables and libraries
+rosbuild_add_library(${PROJECT_NAME} src/serial.cpp)
+#target_link_libraries(${PROJECT_NAME} another_library)
+rosbuild_add_boost_directories()
+rosbuild_link_boost(${PROJECT_NAME} system filesystem thread)
+rosbuild_add_executable(test_serial src/test_serial.cpp)
+target_link_libraries(test_serial serial)
+
+# Check for OS X and if so disable kqueue support in asio
+IF(CMAKE_SYSTEM_NAME MATCHES Darwin)
+    add_definitions(-DBOOST_ASIO_DISABLE_KQUEUE)
+ENDIF(CMAKE_SYSTEM_NAME MATCHES Darwin)
diff --git a/Makefile b/Makefile
deleted file mode 100644
index a818cca..0000000
--- a/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-include $(shell rospack find mk)/cmake_stack.mk
\ No newline at end of file
diff --git a/serial/include/serial.h b/include/serial.h
similarity index 100%
rename from serial/include/serial.h
rename to include/serial.h
diff --git a/serial/CMakeLists.txt b/serial/CMakeLists.txt
deleted file mode 100644
index d10392b..0000000
--- a/serial/CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-cmake_minimum_required(VERSION 2.4.6)
-include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
-
-# Set the build type.  Options are:
-#  Coverage       : w/ debug symbols, w/o optimization, w/ code-coverage
-#  Debug          : w/ debug symbols, w/o optimization
-#  Release        : w/o debug symbols, w/ optimization
-#  RelWithDebInfo : w/ debug symbols, w/ optimization
-#  MinSizeRel     : w/o debug symbols, w/ optimization, stripped binaries
-#set(ROS_BUILD_TYPE RelWithDebInfo)
-
-rosbuild_init()
-
-#set the default path for built executables to the "bin" directory
-set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
-#set the default path for built libraries to the "lib" directory
-set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
-
-#uncomment if you have defined messages
-#rosbuild_genmsg()
-#uncomment if you have defined services
-#rosbuild_gensrv()
-
-#common commands for building c++ executables and libraries
-rosbuild_add_library(${PROJECT_NAME} src/serial.cpp)
-#target_link_libraries(${PROJECT_NAME} another_library)
-rosbuild_add_boost_directories()
-rosbuild_link_boost(${PROJECT_NAME} system filesystem thread)
-rosbuild_add_executable(test_serial src/test_serial.cpp)
-target_link_libraries(test_serial serial)
-
-# Check for OS X and if so disable kqueue support in asio
-IF(CMAKE_SYSTEM_NAME MATCHES Darwin)
-    add_definitions(-DBOOST_ASIO_DISABLE_KQUEUE)
-ENDIF(CMAKE_SYSTEM_NAME MATCHES Darwin)
diff --git a/serial/Makefile b/serial/Makefile
deleted file mode 100644
index b75b928..0000000
--- a/serial/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-include $(shell rospack find mk)/cmake.mk
\ No newline at end of file
diff --git a/serial/mainpage.dox b/serial/mainpage.dox
deleted file mode 100644
index 81ab75a..0000000
--- a/serial/mainpage.dox
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
-\mainpage
-\htmlinclude manifest.html
-
-\b boostserial is ... 
-
-<!-- 
-Provide an overview of your package.
--->
-
-
-\section codeapi Code API
-
-<!--
-Provide links to specific auto-generated API documentation within your
-package that is of particular interest to a reader. Doxygen will
-document pretty much every part of your code, so do your best here to
-point the reader to the actual API.
-
-If your codebase is fairly large or has different sets of APIs, you
-should use the doxygen 'group' tag to keep these APIs together. For
-example, the roscpp documentation has 'libros' group.
--->
-
-
-*/
diff --git a/serial/manifest.xml b/serial/manifest.xml
deleted file mode 100644
index 73ba409..0000000
--- a/serial/manifest.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<package>
-  <description brief="serial">
-
-     serial
-
-  </description>
-  <author>William Woodall</author>
-  <license>BSD</license>
-  <review status="unreviewed" notes=""/>
-  <url>http://ros.org/wiki/serial</url>
-  <depend package="roscpp"/>
-
-</package>
-
-
diff --git a/serial/src/serial.cpp b/src/serial.cpp
similarity index 100%
rename from serial/src/serial.cpp
rename to src/serial.cpp
diff --git a/serial/src/test_serial.cpp b/src/test_serial.cpp
similarity index 100%
rename from serial/src/test_serial.cpp
rename to src/test_serial.cpp
diff --git a/stack.xml b/stack.xml
deleted file mode 100644
index bd07007..0000000
--- a/stack.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<stack>
-  <description brief="wwoodall-ros-pkg">wwoodall-ros-pkg</description>
-  <author>Maintained by William Woodall</author>
-  <license>BSD</license>  
-  <review status="unreviewed" notes=""/>
-  <url>http://ros.org/wiki/wwoodall-ros-pkg</url>
-  <depend stack="ros" />
-
-</stack>