Restructuring directory.
Adding an API to search.