* more shit
* some da good refactor
* some da good refactor
* move file
* changed directory structure ok
* added query