Modify directory structure
Converting global vars to project vars: incomplete.
Converting global vars to project vars: complete.
more refactoring