Fixed mistakes.
Changed project tree
Changed project tree