[master] Restructure + add packages