Refactoring the package names to have a clearer workspace
Optimizing imports