Updated some folder structure