Massive rename of package structure.