Changed architecture

Change-Id: I4a2c5fc0a9c67073aa54f1095a112a5b057456a2