Full rework of search classfiles