search engine working + complete reorganization