Re-factored the names of the packages