Changed folder structure to Eclipse format, and worked on Query 4