Re-Organization

Cleaned up package organization to make it a little more sensible.