Splitted the classes into grouping packages.