fixing old packages and changing imports and naming conventions to reflect new naming