Major restructuring, restart WRF working