Change the directory structure and add new method