Removing nxhtml, old org version, adding new org version