Added Search and image upload and cleaned up organization