added packages + dir cleanup