re-estruturei as packages