Beginning WP modularization