updated package structure to assure there are no issues with constructor
changes