NOW-66 Changed package structure to more closely resemble mean.io