Iss #70: Updated package structure to reflect new upcoming changes