Fix up packages. Use shorter names for files