Move everything/add packages * Remove classes