organization & restructuring: add packages