Updated package structure to better reflect features.