Refactored the package names
Renamed some stuff