Settings added and folder structure updated