Rearrange packages after Sonar and FindBugs checks