moved matahari to packages
updated matahari for ba