fixed some bugs with the search option and created a structure for my project.