* Architectural changes are implementing.. not finished.

Signed-off-by: Baris Yilmaz <baris.yilmaz.1985@gmail.com>