refactored Capital letter package names to CamelCase