initial import and rename of old code