Reorganized folder structure, added preliminary search function