reorganize module layout, adding initial packaging options