Tidying up the standalone project a bit.