Packages round 1

- Make package hierarchy and imports
- Default collection imports
- Remove duplicated onTick() methods
- Some misspell correction