Change hierarchy of the project and fix typos.
Fix small typos/bugs.