Fixed setup script to inclde sub packages