Finished code restructuring.
Started work on the WPF version of Hanasu.