Made some folder naming changes to make it easier to copy into existing projects