Update: Re-arrange directories and delete unwanted directories