packages refactored
Copied star assult for test