Moving everything into an acceptable package namespace