Fix xml to point to right directory, fix org class