Made the package structure less crazy