QP -> WP
Split into one-class-per-file
Fix up some useless stuff