More progress with app organization