Added support for variant specific output directories
General code style unification using UIC_WP_ variables
General code style unification using UIC_WP_ variables