Added search functionality and restructured folders