Move to a better OOP design for the VCS stuff, support WP in a subdir too