Reorganized, installed a few things