Code refactoring.
- Fix type error - Improve build script for rebranding
Prepare more code for rebranding. Fix text translation & conversion errors. Fix misc code bugs.
Adding etc directory