Fix uploader demo and seperate external demos from the rest.