Add installer, move some things around