Cleaned up some formatting.
Moved files into individual packages.