Organization

Moved packets into their own package