App structure update
General settings concept