Reshuffle app structure

As per earlier discussion.