Reorganize device setup and add new packages