[MISC] Started restructuring to better MVVM implementation.