restructure fixes for home server