Rename classes and packages to be more easy to read and find.