Reorganized all components into respective packages.
Merge branch 'master' of https://github.com/Aitalas/Junk