Normalize Activity application architecture