Change Folder Structure and other

Change the structure and other class