clean up tab sp mix
updates packages
reorg the folders