#36 - Reorganize packaging