Update package and class names

Update package and class names to more intuitive system.