Refactor package name because Android market issue