Updated wp8 to not use a subdir and moved to 3.6.1