Modified query to match requirements
added ignore file
reworked directory structure
Start splitting out code into sensible classes.
Removed dead stuff from sample file
updated ignore file