Move from package com.handmark to com.topafce