New file structure updated, all test passed.
//TODO .. more test, refactoring.
Architecture update done, all test passed.
//TODO .. more test, refactoring.