This way it's all in the top level directory. Eventually, this repo will be deleted and merged into the desktop one.