Made Entity package
Renamed powerups package to powerup
Made helper package
Fixed Merge conflict