Moved a few packages around and added some minor features