re-orged the screens folder. Added states to CONST and changes it's structure according to the refactor.
Merge branch 'master' of github.com:tambien/GRID