Re-organize code
..