Renamed package names to com.shidan.*