Made the package structure make more sense