Renamed packages for better management.

Signed-off-by: Simeon Iliev <sisabski23@gmail.com>