refactored package names to comply with CPAN conventions