modified all packages to com.axatrikx.solor.* packages