Change some structure about main app components