Move class to a new package. Fix install goal