reorganized file structure
Merge pull request #1 from RichardAvendano/reStructure

reorganized file structure
file restructure
Merge pull request #2 from RichardAvendano/reStructure

File Restructure
Add pre-canned queries to avoid hitting database for static data