Structure Arrangement

Keep computation out from Activity