Fixed and moved pear packages to separate class