Refactor packages and adding a basic operation class for testing