Implement deployment target updating logic
Re-arrange views and view models by module